eina: Rename EAPI macro to EINA_API in Eina library

Summary:
Patch 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
EAPI is the only solution that worked for MSVC.

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

Reviewers: jptiz, lucas, woohyun, vtorri, raster

Reviewed By: jptiz, lucas, vtorri

Subscribers: ProhtMeyhet, cedric, #reviewers, #committers

Tags: #efl

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

142 files changed, 1742 insertions, 1781 deletions

diff --git a/src/lib/eina/Eina.h b/src/lib/eina/Eina.h
index d7b4c1911a..383696d7d8 100644
--- a/src/lib/eina/Eina.h
+++ b/src/lib/eina/Eina.h
@@ -278,8 +278,6 @@ extern "C" {
 #include <eina_vpath.h>
 #include <eina_abstract_content.h>
 
-#undef EAPI
-#define EAPI
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/eina/eina_abi.c b/src/lib/eina/eina_abi.c
index cdf0f9f450..35d93a51e3 100644
--- a/src/lib/eina/eina_abi.c
+++ b/src/lib/eina/eina_abi.c
@@ -25,12 +25,12 @@
 #include "eina_unicode.h"
 #include "eina_safety_checks.h"
 
-EAPI Eina_Unicode eina_unicode_utf8_get_next(const char *buf, int *iindex)
+EINA_API Eina_Unicode eina_unicode_utf8_get_next(const char *buf, int *iindex)
 {
    return eina_unicode_utf8_next_get(buf, iindex);
 }
 
-EAPI unsigned int
+EINA_API unsigned int
 eina_mempool_alignof(unsigned int size)
 {
    unsigned int align;
diff --git a/src/lib/eina/eina_abstract_content.c b/src/lib/eina/eina_abstract_content.c
index 8ed4dc5a48..02d246bed3 100644
--- a/src/lib/eina/eina_abstract_content.c
+++ b/src/lib/eina/eina_abstract_content.c
@@ -12,7 +12,7 @@ struct _Eina_Content
    const char *file;
    EINA_REFCOUNT;
 };
-EAPI const Eina_Value_Type *EINA_VALUE_TYPE_CONTENT;
+EINA_API const Eina_Value_Type *EINA_VALUE_TYPE_CONTENT;
 
 static int _eina_abstract_content_log_domain = -1;
 
@@ -39,7 +39,7 @@ _eina_content_ref(Eina_Content *content)
    EINA_REFCOUNT_REF(content);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_content_converter_conversion_register(const char *from, const char *to, Eina_Content_Conversion_Callback conversion)
 {
    Eina_Content_Conversion_Node *node = calloc(1, sizeof(Eina_Content_Conversion_Node));
@@ -93,7 +93,7 @@ end:
    return result;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_content_converter_convert_can(const char *from, const char *to)
 {
    return !!_conversion_callback_fetch(from, to);
@@ -107,7 +107,7 @@ _process_cb(const void *container EINA_UNUSED, void *data, void *fdata EINA_UNUS
    return n->to;
  }
 
-EAPI Eina_Iterator*
+EINA_API Eina_Iterator*
 eina_content_converter_possible_conversions(const char *from)
 {
    Eina_List *possibilities = _conversion_callback_fetch_possible(from);
@@ -115,7 +115,7 @@ eina_content_converter_possible_conversions(const char *from)
    return eina_iterator_processed_new(eina_list_iterator_new(possibilities) , EINA_PROCESS_CB(_process_cb), NULL, possibilities);
 }
 
-EAPI Eina_Content*
+EINA_API Eina_Content*
 eina_content_new(Eina_Slice data, const char *type)
 {
    Eina_Content *content;
@@ -149,7 +149,7 @@ err:
    return NULL;
 }
 
-EAPI void
+EINA_API void
 eina_content_free(Eina_Content *content)
 {
    EINA_REFCOUNT_UNREF(content)
@@ -161,7 +161,7 @@ eina_content_free(Eina_Content *content)
      }
 }
 
-EAPI const char*
+EINA_API const char*
 eina_content_as_file(Eina_Content *content)
 {
    if (!content->file)
@@ -189,19 +189,19 @@ eina_content_as_file(Eina_Content *content)
    return content->file;
 }
 
-EAPI const char*
+EINA_API const char*
 eina_content_type_get(Eina_Content *content)
 {
    return content->type;
 }
 
-EAPI Eina_Slice
+EINA_API Eina_Slice
 eina_content_data_get(Eina_Content *content)
 {
    return eina_rw_slice_slice_get(content->data);
 }
 
-EAPI Eina_Content*
+EINA_API Eina_Content*
 eina_content_convert(Eina_Content *content, const char *new_type)
 {
    Eina_Content_Conversion_Callback callback = _conversion_callback_fetch(content->type, new_type);
@@ -370,7 +370,7 @@ _eina_value_type_content_pget(const Eina_Value_Type *type EINA_UNUSED, const voi
    return EINA_TRUE;
 }
 
-EAPI const Eina_Value_Type _EINA_VALUE_TYPE_CONTENT ={
+EINA_API const Eina_Value_Type _EINA_VALUE_TYPE_CONTENT ={
   EINA_VALUE_TYPE_VERSION,
   sizeof(Eina_Content*),
   "Eina_Abstract_Content",
diff --git a/src/lib/eina/eina_abstract_content.h b/src/lib/eina/eina_abstract_content.h
index 1d88e868a3..580ed97242 100644
--- a/src/lib/eina/eina_abstract_content.h
+++ b/src/lib/eina/eina_abstract_content.h
@@ -33,7 +33,7 @@ typedef Eina_Content* (*Eina_Content_Conversion_Callback)(Eina_Content *from, co
  * @return The path to the file. Do not free this.
  *
  */
-EAPI const char* eina_content_as_file(Eina_Content *content);
+EINA_API const char* eina_content_as_file(Eina_Content *content);
 
 /**
  * Convert the content of the object to another type.
@@ -45,7 +45,7 @@ EAPI const char* eina_content_as_file(Eina_Content *content);
  *
  * @return A new content object. The caller of this function is owning this.
  */
-EAPI Eina_Content* eina_content_convert(Eina_Content *content, const char *new_type);
+EINA_API Eina_Content* eina_content_convert(Eina_Content *content, const char *new_type);
 
 /**
  * Get the type of the passed content.
@@ -54,7 +54,7 @@ EAPI Eina_Content* eina_content_convert(Eina_Content *content, const char *new_t
  *
  * @return The type of this content. Do no free this.
  */
-EAPI const char* eina_content_type_get(Eina_Content *content);
+EINA_API const char* eina_content_type_get(Eina_Content *content);
 
 /**
  * Get the Eina_Slice of the passed content.
@@ -63,7 +63,7 @@ EAPI const char* eina_content_type_get(Eina_Content *content);
  *
  * @return An Eina_Slice containing the data. Do not free.
  */
-EAPI Eina_Slice eina_content_data_get(Eina_Content *content);
+EINA_API Eina_Slice eina_content_data_get(Eina_Content *content);
 
 /**
  * Create a new content object, with the provided data and type.
@@ -73,14 +73,14 @@ EAPI Eina_Slice eina_content_data_get(Eina_Content *content);
  *
  * @return The new content object. The caller owns this object.
  */
-EAPI Eina_Content* eina_content_new(Eina_Slice data, const char *type);
+EINA_API Eina_Content* eina_content_new(Eina_Slice data, const char *type);
 
 /**
  * Free the content object.
  *
  * @param[in] content The content to free.
  */
-EAPI void eina_content_free(Eina_Content *content);
+EINA_API void eina_content_free(Eina_Content *content);
 
 /**
  * Register a new conversion callback.
@@ -90,7 +90,7 @@ EAPI void eina_content_free(Eina_Content *content);
  *
  * @return True if the callback was successfully registered.
  */
-EAPI Eina_Bool eina_content_converter_conversion_register(const char *from, const char *to, Eina_Content_Conversion_Callback convertion);
+EINA_API Eina_Bool eina_content_converter_conversion_register(const char *from, const char *to, Eina_Content_Conversion_Callback convertion);
 
 /**
  * Check if a specific conversion can be performed.
@@ -102,7 +102,7 @@ EAPI Eina_Bool eina_content_converter_conversion_register(const char *from, cons
  *
  * @return True if the conversion can be performed.
  */
-EAPI Eina_Bool eina_content_converter_convert_can(const char *from, const char *to);
+EINA_API Eina_Bool eina_content_converter_convert_can(const char *from, const char *to);
 
 /**
  * Returns an iterator containing all the target types that the provided source type can be converted to.
@@ -111,9 +111,9 @@ EAPI Eina_Bool eina_content_converter_convert_can(const char *from, const char *
  *
  * @return An Iterator containing MIME type strings. Free this via eina_iterator_free.
  */
-EAPI Eina_Iterator* eina_content_converter_possible_conversions(const char *from);
+EINA_API Eina_Iterator* eina_content_converter_possible_conversions(const char *from);
 
-EAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_CONTENT;
+EINA_API extern const Eina_Value_Type *EINA_VALUE_TYPE_CONTENT;
 
 /**
  * Convert the Eina_Content object to an Eina_Value.
@@ -122,7 +122,7 @@ EAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_CONTENT;
  *
  * @return An newly-allocated Eina_Value. Caller owns it.
  */
-EAPI Eina_Value* eina_value_content_new(Eina_Content *content);
+EINA_API Eina_Value* eina_value_content_new(Eina_Content *content);
 
 /**
  * Creates an Eina_Value from an Eina_Content.
@@ -131,7 +131,7 @@ EAPI Eina_Value* eina_value_content_new(Eina_Content *content);
  *
  * @return An Eina_Value with type EINA_VALUE_TYPE_CONTENT.
  */
-EAPI Eina_Value eina_value_content_init(Eina_Content *content);
+EINA_API Eina_Value eina_value_content_init(Eina_Content *content);
 
 /**
  * Gets the content from the Eina_Value.
@@ -142,7 +142,7 @@ EAPI Eina_Value eina_value_content_init(Eina_Content *content);
  *
  * @return A newly-allocated Eina_Content. Caller owns it.
  */
-EAPI Eina_Content* eina_value_to_content(const Eina_Value *value);
+EINA_API Eina_Content* eina_value_to_content(const Eina_Value *value);
 
 
 static inline Eina_Iterator*
diff --git a/src/lib/eina/eina_accessor.c b/src/lib/eina/eina_accessor.c
index 812da5c9c1..f6b4fb6221 100644
--- a/src/lib/eina/eina_accessor.c
+++ b/src/lib/eina/eina_accessor.c
@@ -92,7 +92,7 @@ eina_accessor_shutdown(void)
 *============================================================================*/
 
 
-EAPI void
+EINA_API void
 eina_accessor_free(Eina_Accessor *accessor)
 {
    if (!accessor)
@@ -103,7 +103,7 @@ eina_accessor_free(Eina_Accessor *accessor)
    accessor->free(accessor);
 }
 
-EAPI void *
+EINA_API void *
 eina_accessor_container_get(Eina_Accessor *accessor)
 {
    EINA_MAGIC_CHECK_ACCESSOR(accessor);
@@ -112,7 +112,7 @@ eina_accessor_container_get(Eina_Accessor *accessor)
    return accessor->get_container(accessor);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_accessor_data_get(Eina_Accessor *accessor,
                        unsigned int position,
                        void **data)
@@ -124,7 +124,7 @@ eina_accessor_data_get(Eina_Accessor *accessor,
    return accessor->get_at(accessor, position, data);
 }
 
-EAPI void
+EINA_API void
 eina_accessor_over(Eina_Accessor *accessor,
                    Eina_Each_Cb cb,
                    unsigned int start,
@@ -156,7 +156,7 @@ eina_accessor_over(Eina_Accessor *accessor,
    (void) eina_accessor_unlock(accessor);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_accessor_lock(Eina_Accessor *accessor)
 {
    EINA_MAGIC_CHECK_ACCESSOR(accessor);
@@ -167,7 +167,7 @@ eina_accessor_lock(Eina_Accessor *accessor)
    return EINA_TRUE;
 }
 
-EAPI Eina_Accessor*
+EINA_API Eina_Accessor*
 eina_accessor_clone(Eina_Accessor *accessor)
 {
    EINA_MAGIC_CHECK_ACCESSOR(accessor);
@@ -179,7 +179,7 @@ eina_accessor_clone(Eina_Accessor *accessor)
    return NULL;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_accessor_unlock(Eina_Accessor *accessor)
 {
    EINA_MAGIC_CHECK_ACCESSOR(accessor);
@@ -235,7 +235,7 @@ eina_carray_length_accessor_free(Eina_Accessor_CArray_Length *accessor)
    free(accessor);
 }
 
-EAPI Eina_Accessor *
+EINA_API Eina_Accessor *
 eina_carray_length_accessor_new(void** array, unsigned int step, unsigned int length)
 {
    Eina_Accessor_CArray_Length *accessor;
@@ -258,7 +258,7 @@ eina_carray_length_accessor_new(void** array, unsigned int step, unsigned int le
    return &accessor->accessor;
 }
 
-EAPI Eina_Accessor *
+EINA_API Eina_Accessor *
 eina_carray_length_ptr_accessor_new(void** array, unsigned int step, unsigned int length)
 {
    Eina_Accessor_CArray_Length *accessor;
diff --git a/src/lib/eina/eina_accessor.h b/src/lib/eina/eina_accessor.h
index 5e61dc7810..c70f8ed495 100644
--- a/src/lib/eina/eina_accessor.h
+++ b/src/lib/eina/eina_accessor.h
@@ -205,7 +205,7 @@ struct _Eina_Accessor
  * @param[in] accessor The accessor to free
  *
  */
-EAPI void      eina_accessor_free(Eina_Accessor *accessor);
+EINA_API void      eina_accessor_free(Eina_Accessor *accessor);
 
 /**
  * @brief Gets the data of an accessor at the given position.
@@ -219,7 +219,7 @@ EAPI void      eina_accessor_free(Eina_Accessor *accessor);
  * @return #EINA_TRUE on success, otherwise #EINA_FALSE
  *
  */
-EAPI Eina_Bool eina_accessor_data_get(Eina_Accessor *accessor,
+EINA_API Eina_Bool eina_accessor_data_get(Eina_Accessor *accessor,
                                       unsigned int   position,
                                       void         **data) EINA_ARG_NONNULL(1);
 
@@ -231,7 +231,7 @@ EAPI Eina_Bool eina_accessor_data_get(Eina_Accessor *accessor,
  * @return The container that created the accessor
  *
  */
-EAPI void *eina_accessor_container_get(Eina_Accessor *accessor) EINA_ARG_NONNULL(1) EINA_PURE;
+EINA_API void *eina_accessor_container_get(Eina_Accessor *accessor) EINA_ARG_NONNULL(1) EINA_PURE;
 
 /**
  * @brief Iterates over the container and executes a callback on the chosen elements.
@@ -249,7 +249,7 @@ EAPI void *eina_accessor_container_get(Eina_Accessor *accessor) EINA_ARG_NONNULL
  * @param[in] fdata The data passed to the callback
  *
  */
-EAPI void  eina_accessor_over(Eina_Accessor *accessor,
+EINA_API void  eina_accessor_over(Eina_Accessor *accessor,
                               Eina_Each_Cb   cb,
                               unsigned int   start,
                               unsigned int   end,
@@ -269,7 +269,7 @@ EAPI void  eina_accessor_over(Eina_Accessor *accessor,
  *
  * @warning None of the existing eina data structures are lockable.
  */
-EAPI Eina_Bool eina_accessor_lock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_accessor_lock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Clones the container of the accessor.
@@ -278,7 +278,7 @@ EAPI Eina_Bool eina_accessor_lock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
  * @return Another accessor
  * @since 1.10
  */
-EAPI Eina_Accessor* eina_accessor_clone(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
+EINA_API Eina_Accessor* eina_accessor_clone(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Unlocks the container of the accessor.
@@ -293,7 +293,7 @@ EAPI Eina_Accessor* eina_accessor_clone(Eina_Accessor *accessor) EINA_ARG_NONNUL
  *
  * @warning None of the existing eina data structures are lockable.
  */
-EAPI Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
 
 /**
  * @def EINA_ACCESSOR_FOREACH
@@ -363,7 +363,7 @@ EAPI Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1)
  *
  * @since 1.23
  */
-EAPI Eina_Accessor* eina_carray_length_accessor_new(void** array, unsigned int step, unsigned int length);
+EINA_API Eina_Accessor* eina_carray_length_accessor_new(void** array, unsigned int step, unsigned int length);
 
 
 /**
@@ -383,7 +383,7 @@ EAPI Eina_Accessor* eina_carray_length_accessor_new(void** array, unsigned int s
 
  * @since 1.24
  */
-EAPI Eina_Accessor* eina_carray_length_ptr_accessor_new(void** array, unsigned int step, unsigned int length);
+EINA_API Eina_Accessor* eina_carray_length_ptr_accessor_new(void** array, unsigned int step, unsigned int length);
 /**
  * @def EINA_C_ARRAY_ACCESSOR_NEW
  * @brief Creates an Eina_Accessor that wraps a plain fixed size C array
diff --git a/src/lib/eina/eina_array.c b/src/lib/eina/eina_array.c
index cda5181213..a7c50d28dd 100644
--- a/src/lib/eina/eina_array.c
+++ b/src/lib/eina/eina_array.c
@@ -191,7 +191,7 @@ eina_array_accessor_clone(const Eina_Accessor_Array *it)
 }
 
 /* used from eina_inline_array.x, thus a needed symbol */
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_array_grow(Eina_Array *array)
 {
    void **tmp;
@@ -272,7 +272,7 @@ eina_array_shutdown(void)
  *                                   API                                      *
  *============================================================================*/
 
-EAPI Eina_Array *
+EINA_API Eina_Array *
 eina_array_new(unsigned int step)
 {
    Eina_Array *array;
@@ -291,7 +291,7 @@ eina_array_new(unsigned int step)
    return array;
 }
 
-EAPI void
+EINA_API void
 eina_array_free(Eina_Array *array)
 {
    if (!array) return;
@@ -301,7 +301,7 @@ eina_array_free(Eina_Array *array)
    MAGIC_FREE(array);
 }
 
-EAPI void
+EINA_API void
 eina_array_step_set(Eina_Array *array,
                     unsigned int sizeof_eina_array,
                     unsigned int step)
@@ -326,7 +326,7 @@ eina_array_step_set(Eina_Array *array,
    EINA_MAGIC_SET(array, EINA_MAGIC_ARRAY);
 }
 
-EAPI void
+EINA_API void
 eina_array_flush(Eina_Array *array)
 {
    EINA_SAFETY_ON_NULL_RETURN(array);
@@ -342,7 +342,7 @@ eina_array_flush(Eina_Array *array)
    array->data = NULL;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_array_remove(Eina_Array *array, Eina_Bool (*keep)(void *data,
                                                        void *gdata),
                   void *gdata)
@@ -390,7 +390,7 @@ eina_array_remove(Eina_Array *array, Eina_Bool (*keep)(void *data,
    return EINA_TRUE;
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_array_iterator_new(const Eina_Array *array)
 {
    Eina_Iterator_Array *it;
@@ -415,7 +415,7 @@ eina_array_iterator_new(const Eina_Array *array)
    return &it->iterator;
 }
 
-EAPI Eina_Accessor *
+EINA_API Eina_Accessor *
 eina_array_accessor_new(const Eina_Array *array)
 {
    Eina_Accessor_Array *ac;
diff --git a/src/lib/eina/eina_array.h b/src/lib/eina/eina_array.h
index c6e62ad142..3c4eb6f753 100644
--- a/src/lib/eina/eina_array.h
+++ b/src/lib/eina/eina_array.h
@@ -251,7 +251,7 @@ struct _Eina_Array
  * This function return a valid array on success, or @c NULL if memory
  * allocation fails.
  */
-EAPI Eina_Array *eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Array *eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Frees an array.
@@ -263,7 +263,7 @@ EAPI Eina_Array *eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_
  * does not free the memory allocated for the elements of @p array. To
  * free them, walk the array with #EINA_ARRAY_ITER_NEXT.
  */
-EAPI void eina_array_free(Eina_Array *array);
+EINA_API void eina_array_free(Eina_Array *array);
 
 /**
  * @brief Sets the step of an array.
@@ -278,7 +278,7 @@ EAPI void eina_array_free(Eina_Array *array);
  *
  * @warning This function can @b only be called on uninitialized arrays.
  */
-EAPI void        eina_array_step_set(Eina_Array  *array,
+EINA_API void        eina_array_step_set(Eina_Array  *array,
                                      unsigned int sizeof_eina_array,
                                      unsigned int step) EINA_ARG_NONNULL(1);
 /**
@@ -303,7 +303,7 @@ static inline void eina_array_clean(Eina_Array *array) EINA_ARG_NONNULL(1);
  * there is no check of @p array. If it is @c NULL or invalid, the
  * program may crash.
  */
-EAPI void eina_array_flush(Eina_Array *array) EINA_ARG_NONNULL(1);
+EINA_API void eina_array_flush(Eina_Array *array) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Rebuilds an array by specifying the data to keep.
@@ -321,7 +321,7 @@ EAPI void eina_array_flush(Eina_Array *array) EINA_ARG_NONNULL(1);
  * If it wasn't able to remove items due to an allocation failure, it will
  * return #EINA_FALSE.
  */
-EAPI Eina_Bool eina_array_remove(Eina_Array * array,
+EINA_API Eina_Bool eina_array_remove(Eina_Array * array,
                                  Eina_Bool (*keep)(void *data, void *gdata),
                                  void *gdata) EINA_ARG_NONNULL(1, 2);
 
@@ -441,7 +441,7 @@ static inline Eina_Bool  eina_array_find(const Eina_Array *array,
  *
  * @see Eina_Iterator_Group
  */
-EAPI Eina_Iterator        *eina_array_iterator_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Iterator        *eina_array_iterator_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Gets a new accessor associated with an array.
@@ -456,7 +456,7 @@ EAPI Eina_Iterator        *eina_array_iterator_new(const Eina_Array *array) EINA
  *
  * @see Eina_Accessor_Group
  */
-EAPI Eina_Accessor        *eina_array_accessor_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Accessor        *eina_array_accessor_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Iterates over an array using a callback function.
diff --git a/src/lib/eina/eina_benchmark.c b/src/lib/eina/eina_benchmark.c
index 7afa8e8e56..3b4f07bc46 100644
--- a/src/lib/eina/eina_benchmark.c
+++ b/src/lib/eina/eina_benchmark.c
@@ -134,7 +134,7 @@ eina_benchmark_shutdown(void)
 *                                   API                                      *
 *============================================================================*/
 
-EAPI Eina_Benchmark *
+EINA_API Eina_Benchmark *
 eina_benchmark_new(const char *name, const char *run)
 {
    Eina_Benchmark *new;
@@ -148,7 +148,7 @@ eina_benchmark_new(const char *name, const char *run)
    return new;
 }
 
-EAPI void
+EINA_API void
 eina_benchmark_free(Eina_Benchmark *bench)
 {
    Eina_Array *names;
@@ -179,7 +179,7 @@ eina_benchmark_free(Eina_Benchmark *bench)
    free(bench);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_benchmark_register(Eina_Benchmark *bench,
                         const char *name,
                         Eina_Benchmark_Specimens bench_cb,
@@ -209,7 +209,7 @@ eina_benchmark_register(Eina_Benchmark *bench,
    return EINA_TRUE;
 }
 
-EAPI Eina_Array *
+EINA_API Eina_Array *
 eina_benchmark_run(Eina_Benchmark *bench)
 {
    FILE *main_script;
diff --git a/src/lib/eina/eina_benchmark.h b/src/lib/eina/eina_benchmark.h
index b772132782..c906abba58 100644
--- a/src/lib/eina/eina_benchmark.h
+++ b/src/lib/eina/eina_benchmark.h
@@ -359,7 +359,7 @@ typedef void (*Eina_Benchmark_Specimens)(int request);
  * When the new module is not needed anymore, use
  * eina_benchmark_free() to free the allocated memory.
  */
-EAPI Eina_Benchmark *eina_benchmark_new(const char *name,
+EINA_API Eina_Benchmark *eina_benchmark_new(const char *name,
                                         const char *run);
 
 /**
@@ -371,7 +371,7 @@ EAPI Eina_Benchmark *eina_benchmark_new(const char *name,
  * registered and frees @p bench. If @p bench is @c NULL, this
  * function returns immediately.
  */
-EAPI void            eina_benchmark_free(Eina_Benchmark *bench);
+EINA_API void            eina_benchmark_free(Eina_Benchmark *bench);
 
 /**
  * @brief Adds a test to a benchmark.
@@ -393,7 +393,7 @@ EAPI void            eina_benchmark_free(Eina_Benchmark *bench);
  * If @p bench is @c NULL or @p count_step is 0, this function returns
  * immediately and does not add any tests to the benchmark.
  */
-EAPI Eina_Bool       eina_benchmark_register(Eina_Benchmark          *bench,
+EINA_API Eina_Bool       eina_benchmark_register(Eina_Benchmark          *bench,
                                              const char              *name,
                                              Eina_Benchmark_Specimens bench_cb,
                                              int                      count_start,
@@ -422,7 +422,7 @@ EAPI Eina_Bool       eina_benchmark_register(Eina_Benchmark          *bench,
  * the gnuplot file. The number of times each test is executed is
  * controlled by the parameters passed to eina_benchmark_register().
  */
-EAPI Eina_Array *eina_benchmark_run(Eina_Benchmark *bench);
+EINA_API Eina_Array *eina_benchmark_run(Eina_Benchmark *bench);
 
 /**
  * @}
diff --git a/src/lib/eina/eina_bezier.c b/src/lib/eina/eina_bezier.c
index b3b093c790..43dbe33578 100644
--- a/src/lib/eina/eina_bezier.c
+++ b/src/lib/eina/eina_bezier.c
@@ -106,7 +106,7 @@ _eina_bezier_length_helper(const Eina_Bezier *b)
    return len;
 }
 
-EAPI void
+EINA_API void
 eina_bezier_values_set(Eina_Bezier *b,
                        double start_x, double start_y,
                        double ctrl_start_x, double ctrl_start_y,
@@ -123,7 +123,7 @@ eina_bezier_values_set(Eina_Bezier *b,
    b->end.y = end_y;
 }
 
-EAPI void
+EINA_API void
 eina_bezier_values_get(const Eina_Bezier *b,
                        double *start_x, double *start_y,
                        double *ctrl_start_x, double *ctrl_start_y,
@@ -141,7 +141,7 @@ eina_bezier_values_get(const Eina_Bezier *b,
 }
 
 
-EAPI void
+EINA_API void
 eina_bezier_point_at(const Eina_Bezier *bz, double t, double *px, double *py)
 {
    double m_t = 1.0 - t;
@@ -169,7 +169,7 @@ eina_bezier_point_at(const Eina_Bezier *bz, double t, double *px, double *py)
      }
 }
 
-EAPI double
+EINA_API double
 eina_bezier_angle_at(const Eina_Bezier *b, double t)
 {
    double x, y;
@@ -183,7 +183,7 @@ eina_bezier_angle_at(const Eina_Bezier *b, double t)
    return theta_normalized;
 }
 
-EAPI double
+EINA_API double
 eina_bezier_length_get(const Eina_Bezier *b)
 {
    return _eina_bezier_length_helper(b);
@@ -218,7 +218,7 @@ _eina_bezier_split_left(Eina_Bezier *b, double t, Eina_Bezier *left)
    left->end.y = b->start.y = left->ctrl_end.y + t * (b->ctrl_start.y - left->ctrl_end.y);
 }
 
-EAPI double
+EINA_API double
 eina_bezier_t_at(const Eina_Bezier *b, double l)
 {
    double len = eina_bezier_length_get(b);
@@ -256,7 +256,7 @@ eina_bezier_t_at(const Eina_Bezier *b, double l)
    return t;
 }
 
-EAPI void
+EINA_API void
 eina_bezier_split_at_length(const Eina_Bezier *b, double len,
                             Eina_Bezier *left, Eina_Bezier *right)
 {
@@ -270,7 +270,7 @@ eina_bezier_split_at_length(const Eina_Bezier *b, double len,
    _eina_bezier_split_left(right, t, left);
 }
 
-EAPI void
+EINA_API void
 eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, double *h)
 {
    double xmin = b->start.x;
@@ -310,7 +310,7 @@ eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, do
    if (h) *h = ymax - ymin;
 }
 
-EAPI void
+EINA_API void
 eina_bezier_on_interval(Eina_Bezier *b, double t0, double t1, Eina_Bezier *result)
 {
    Eina_Bezier bezier;
diff --git a/src/lib/eina/eina_bezier.h b/src/lib/eina/eina_bezier.h
index 2c886fa681..1779da09fc 100644
--- a/src/lib/eina/eina_bezier.h
+++ b/src/lib/eina/eina_bezier.h
@@ -71,7 +71,7 @@ struct _Eina_Bezier
  * @p b. No check is done on @p b.
  * @since 1.16
  */
-EAPI void eina_bezier_values_set(Eina_Bezier *b, double start_x, double start_y, double ctrl_start_x, double ctrl_start_y, double ctrl_end_x, double ctrl_end_y, double end_x, double end_y) EINA_ARG_NONNULL(1);
+EINA_API void eina_bezier_values_set(Eina_Bezier *b, double start_x, double start_y, double ctrl_start_x, double ctrl_start_y, double ctrl_end_x, double ctrl_end_y, double end_x, double end_y) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Gets the values of the points of the given floating
@@ -90,7 +90,7 @@ EAPI void eina_bezier_values_set(Eina_Bezier *b, double start_x, double start_y,
  * @p b. No check is done on @p b.
  * @since 1.16
  */
-EAPI void eina_bezier_values_get(const Eina_Bezier *b, double *start_x, double *start_y, double *ctrl_start_x, double *ctrl_start_y, double *ctrl_end_x, double *ctrl_end_y, double *end_x, double *end_y) EINA_ARG_NONNULL(1);
+EINA_API void eina_bezier_values_get(const Eina_Bezier *b, double *start_x, double *start_y, double *ctrl_start_x, double *ctrl_start_y, double *ctrl_end_x, double *ctrl_end_y, double *end_x, double *end_y) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Calculates the approximate length of the given floating point
@@ -106,7 +106,7 @@ EAPI void eina_bezier_values_get(const Eina_Bezier *b, double *start_x, double *
  * No check is done on @p b.
  * @since 1.16
  */
-EAPI double eina_bezier_length_get(const Eina_Bezier *b) EINA_ARG_NONNULL(1);
+EINA_API double eina_bezier_length_get(const Eina_Bezier *b) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Returns the relative position on a bezier at a given length.
@@ -123,7 +123,7 @@ EAPI double eina_bezier_length_get(const Eina_Bezier *b) EINA_ARG_NONNULL(1);
  *
  * @since 1.16
  */
-EAPI double eina_bezier_t_at(const Eina_Bezier *b, double len) EINA_ARG_NONNULL(1);
+EINA_API double eina_bezier_t_at(const Eina_Bezier *b, double len) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Gets the point on the bezier curve at position t.
@@ -136,7 +136,7 @@ EAPI double eina_bezier_t_at(const Eina_Bezier *b, double len) EINA_ARG_NONNULL(
  * No check is done on @p b.
  * @since 1.16
  */
-EAPI void eina_bezier_point_at(const Eina_Bezier *b, double t, double *px, double *py) EINA_ARG_NONNULL(1);
+EINA_API void eina_bezier_point_at(const Eina_Bezier *b, double t, double *px, double *py) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Determines the slope of the bezier at a given position.
@@ -147,7 +147,7 @@ EAPI void eina_bezier_point_at(const Eina_Bezier *b, double t, double *px, doubl
  * No check is done on @p b.
  * @since 1.16
  */
-EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNULL(1);
+EINA_API double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Splits the bezier at a given length.
@@ -160,7 +160,7 @@ EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNUL
  * No check is done on @p b.
  * @since 1.16
  */
-EAPI void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bezier *left, Eina_Bezier *right) EINA_ARG_NONNULL(1);
+EINA_API void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bezier *left, Eina_Bezier *right) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Calculates the bounding box for the bezier.
@@ -174,7 +174,7 @@ EAPI void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bez
  * No check is done on @p b.
  * @since 1.17
  */
-EAPI void eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, double *h) EINA_ARG_NONNULL(1);
+EINA_API void eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, double *h) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Finds the bezier between the given interval.
@@ -187,7 +187,7 @@ EAPI void eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, dou
  * No check is done on @p b.
  * @since 1.17
  */
-EAPI void eina_bezier_on_interval(Eina_Bezier *b, double t0, double t1, Eina_Bezier *result);
+EINA_API void eina_bezier_on_interval(Eina_Bezier *b, double t0, double t1, Eina_Bezier *result);
 
 /**
  * @}
diff --git a/src/lib/eina/eina_binbuf.c b/src/lib/eina/eina_binbuf.c
index d392686c33..9e7e5de337 100644
--- a/src/lib/eina/eina_binbuf.c
+++ b/src/lib/eina/eina_binbuf.c
@@ -53,7 +53,7 @@ static const char __BINBUF_MAGIC_STR[] = "Eina Binbuf";
 
 #include "eina_binbuf_template_c.x"
 
-EAPI Eina_Binbuf *
+EINA_API Eina_Binbuf *
 eina_binbuf_manage_new(const unsigned char *str, size_t length, Eina_Bool ro)
 {
    Eina_Binbuf *buf;
diff --git a/src/lib/eina/eina_binbuf.h b/src/lib/eina/eina_binbuf.h
index dbbcf9e31a..99cda39f15 100644
--- a/src/lib/eina/eina_binbuf.h
+++ b/src/lib/eina/eina_binbuf.h
@@ -47,7 +47,7 @@ typedef struct _Eina_Strbuf Eina_Binbuf;
  * @see eina_binbuf_append()
  * @see eina_binbuf_string_get()
  */
-EAPI Eina_Binbuf *eina_binbuf_new(void) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Binbuf *eina_binbuf_new(void) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Creates a new string buffer using the passed string.
@@ -73,7 +73,7 @@ EAPI Eina_Binbuf *eina_binbuf_new(void) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
  *
  * @since 1.14.0
  */
-EAPI Eina_Binbuf *eina_binbuf_manage_new(const unsigned char *str, size_t length, Eina_Bool ro) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Binbuf *eina_binbuf_manage_new(const unsigned char *str, size_t length, Eina_Bool ro) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Creates a new string buffer using the passed string.
@@ -89,7 +89,7 @@ EAPI Eina_Binbuf *eina_binbuf_manage_new(const unsigned char *str, size_t length
  *
  * @since 1.2.0
  */
-EAPI Eina_Binbuf *eina_binbuf_manage_new_length(unsigned char *str, size_t length) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_DEPRECATED;
+EINA_API Eina_Binbuf *eina_binbuf_manage_new_length(unsigned char *str, size_t length) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_DEPRECATED;
 
 /**
  * @brief Creates a new string buffer using the passed string.
@@ -110,7 +110,7 @@ EAPI Eina_Binbuf *eina_binbuf_manage_new_length(unsigned char *str, size_t lengt
  *
  * @since 1.9.0
  */
-EAPI Eina_Binbuf *eina_binbuf_manage_read_only_new_length(const unsigned char *str, size_t length) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_DEPRECATED;
+EINA_API Eina_Binbuf *eina_binbuf_manage_read_only_new_length(const unsigned char *str, size_t length) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_DEPRECATED;
 
 /**
  * @brief Frees a string buffer.
@@ -120,7 +120,7 @@ EAPI Eina_Binbuf *eina_binbuf_manage_read_only_new_length(const unsigned char *s
  * This function frees the memory of @p buf. @p buf must have been
  * created by eina_binbuf_new().
  */
-EAPI void eina_binbuf_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
+EINA_API void eina_binbuf_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Resets a string buffer.
@@ -130,7 +130,7 @@ EAPI void eina_binbuf_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
  * This function resets @p buf: the buffer len is set to 0, and the
  * string is set to '\\0'. No memory is freed.
  */
-EAPI void eina_binbuf_reset(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
+EINA_API void eina_binbuf_reset(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Expands a buffer, making room for at least @p minimum_unused_space.
@@ -160,7 +160,7 @@ EAPI void eina_binbuf_reset(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
  *
  * @since 1.19
  */
-EAPI Eina_Rw_Slice eina_binbuf_expand(Eina_Binbuf *buf, size_t minimum_unused_space) EINA_ARG_NONNULL(1);
+EINA_API Eina_Rw_Slice eina_binbuf_expand(Eina_Binbuf *buf, size_t minimum_unused_space) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Marks more bytes as used.
@@ -180,7 +180,7 @@ EAPI Eina_Rw_Slice eina_binbuf_expand(Eina_Binbuf *buf, size_t minimum_unused_sp
  *
  * @since 1.19
  */
-EAPI Eina_Bool eina_binbuf_use(Eina_Binbuf *buf, size_t extra_bytes) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_binbuf_use(Eina_Binbuf *buf, size_t extra_bytes) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Appends a string of exact length to a buffer, reallocating as
@@ -200,7 +200,7 @@ EAPI Eina_Bool eina_binbuf_use(Eina_Binbuf *buf, size_t extra_bytes) EINA_ARG_NO
  * @see eina_binbuf_append()
  * @see eina_binbuf_append_n()
  */
-EAPI Eina_Bool eina_binbuf_append_length(Eina_Binbuf *buf, const unsigned char *str, size_t length) EINA_ARG_NONNULL(1, 2);
+EINA_API Eina_Bool eina_binbuf_append_length(Eina_Binbuf *buf, const unsigned char *str, size_t length) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @brief Appends a slice to a buffer, reallocating as necessary.
@@ -213,7 +213,7 @@ EAPI Eina_Bool eina_binbuf_append_length(Eina_Binbuf *buf, const unsigned char *
  *
  * @since 1.19
  */
-EAPI Eina_Bool eina_binbuf_append_slice(Eina_Binbuf *buf, const Eina_Slice slice) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_binbuf_append_slice(Eina_Binbuf *buf, const Eina_Slice slice) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Appends an Eina_Binbuf to a buffer, reallocating as necessary.
@@ -232,7 +232,7 @@ EAPI Eina_Bool eina_binbuf_append_slice(Eina_Binbuf *buf, const Eina_Slice slice
  *
  * @since 1.9.0
  */
-EAPI Eina_Bool eina_binbuf_append_buffer(Eina_Binbuf *buf, const Eina_Binbuf *data) EINA_ARG_NONNULL(1, 2);
+EINA_API Eina_Bool eina_binbuf_append_buffer(Eina_Binbuf *buf, const Eina_Binbuf *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @brief Appends a character to a string buffer, reallocating as
@@ -244,7 +244,7 @@ EAPI Eina_Bool eina_binbuf_append_buffer(Eina_Binbuf *buf, const Eina_Binbuf *da
  *
  * This function appends @p c to @p buf.
  */
-EAPI Eina_Bool eina_binbuf_append_char(Eina_Binbuf *buf, unsigned char c) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_binbuf_append_char(Eina_Binbuf *buf, unsigned char c) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Inserts a string of exact length into a buffer, reallocating as necessary.
@@ -264,7 +264,7 @@ EAPI Eina_Bool eina_binbuf_append_char(Eina_Binbuf *buf, unsigned char c) EINA_A
  * @see eina_binbuf_insert()
  * @see eina_binbuf_insert_n()
  */
-EAPI Eina_Bool eina_binbuf_insert_length(Eina_Binbuf *buf, const unsigned char *str, size_t length, size_t pos) EINA_ARG_NONNULL(1, 2);
+EINA_API Eina_Bool eina_binbuf_insert_length(Eina_Binbuf *buf, const unsigned char *str, size_t length, size_t pos) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @brief Inserts a slice into a buffer, reallocating as necessary.
@@ -278,7 +278,7 @@ EAPI Eina_Bool eina_binbuf_insert_length(Eina_Binbuf *buf, const unsigned char *
  *
  * @since 1.19.0
  */
-EAPI Eina_Bool eina_binbuf_insert_slice(Eina_Binbuf *buf, const Eina_Slice slice, size_t pos) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_binbuf_insert_slice(Eina_Binbuf *buf, const Eina_Slice slice, size_t pos) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Inserts a character into a string buffer, reallocating as
@@ -291,7 +291,7 @@ EAPI Eina_Bool eina_binbuf_insert_slice(Eina_Binbuf *buf, const Eina_Slice slice
  *
  * This function inserts @p c to @p buf at position @p pos.
  */
-EAPI Eina_Bool eina_binbuf_insert_char(Eina_Binbuf *buf, unsigned char c, size_t pos) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_binbuf_insert_char(Eina_Binbuf *buf, unsigned char c, size_t pos) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Removes a slice of the given string buffer.
@@ -307,7 +307,7 @@ EAPI Eina_Bool eina_binbuf_insert_char(Eina_Binbuf *buf, unsigned char c, size_t
  * (inclusive) and ending at @p end (non-inclusive). Both values are
  * in bytes.
  */
-EAPI Eina_Bool eina_binbuf_remove(Eina_Binbuf *buf, size_t start, size_t end) EINA_ARG_NONNULL(1);
+EINA_API Eina_Bool eina_binbuf_remove(Eina_Binbuf *buf, size_t start, size_t end) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Retrieves a pointer to the contents of a string buffer.
@@ -322,7 +322,7 @@ EAPI Eina_Bool eina_binbuf_remove(Eina_Binbuf *buf, size_t start, size_t end) EI
  *
  * @see eina_binbuf_string_steal()
  */
-EAPI const unsigned char *eina_binbuf_string_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EINA_API const unsigned char *eina_binbuf_string_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Steals the contents of a string buffer.
@@ -337,7 +337,7 @@ EAPI const unsigned char *eina_binbuf_string_get(const Eina_Binbuf *buf) EINA_AR
  *
  * @see eina_binbuf_string_get()
  */
-EAPI unsigned char *eina_binbuf_string_steal(Eina_Binbuf *buf) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EINA_API unsigned char *eina_binbuf_string_steal(Eina_Binbuf *buf) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Frees the contents of a string buffer but not the buffer.
@@ -347,7 +347,7 @@ EAPI unsigned char *eina_binbuf_string_steal(Eina_Binbuf *buf) EINA_MALLOC EINA_
  * This function frees the string contained in @p buf without freeing
  * @p buf.
  */
-EAPI void eina_binbuf_string_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
+EINA_API void eina_binbuf_string_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Retrieves the length of the string buffer's content.
@@ -357,7 +357,7 @@ EAPI void eina_binbuf_string_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
  *
  * This function returns the length of @p buf.
  */
-EAPI size_t eina_binbuf_length_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EINA_API size_t eina_binbuf_length_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Gets a read-only slice of the buffer contents.
@@ -368,7 +368,7 @@ EAPI size_t eina_binbuf_length_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) E
  *
  * @since 1.19
  */
-EAPI Eina_Slice eina_binbuf_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EINA_API Eina_Slice eina_binbuf_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Gets a read-write slice of the buffer contents.
@@ -382,7 +382,7 @@ EAPI Eina_Slice eina_binbuf_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_R
  *
  * @since 1.19
  */
-EAPI Eina_Rw_Slice eina_binbuf_rw_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EINA_API Eina_Rw_Slice eina_binbuf_rw_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Frees the buffer, returning its old contents.
@@ -393,7 +393,7 @@ EAPI Eina_Rw_Slice eina_binbuf_rw_slice_get(const Eina_Binbuf *buf) EINA_WARN_UN
  *
  * @since 1.19
  */
-EAPI unsigned char* eina_binbuf_release(Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EINA_API unsigned char* eina_binbuf_release(Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @}
diff --git a/src/lib/eina/eina_binbuf_template_c.x b/src/lib/eina/eina_binbuf_template_c.x
index ef6a58befd..b693c44f8d 100644
--- a/src/lib/eina/eina_binbuf_template_c.x
+++ b/src/lib/eina/eina_binbuf_template_c.x
@@ -57,7 +57,7 @@ _FUNC_EXPAND(shutdown)(void)
  *                                   API                                      *
  *============================================================================*/
 
-EAPI _STRBUF_STRUCT_NAME *
+EINA_API _STRBUF_STRUCT_NAME *
 _FUNC_EXPAND(new)(void)
 {
    _STRBUF_STRUCT_NAME *buf = eina_strbuf_common_new(_STRBUF_CSIZE);
@@ -65,7 +65,7 @@ _FUNC_EXPAND(new)(void)
    return buf;
 }
 
-EAPI _STRBUF_STRUCT_NAME *
+EINA_API _STRBUF_STRUCT_NAME *
 _FUNC_EXPAND(manage_new_length)(_STRBUF_DATA_TYPE *str, size_t length)
 {
    _STRBUF_STRUCT_NAME *buf =
@@ -74,7 +74,7 @@ _FUNC_EXPAND(manage_new_length)(_STRBUF_DATA_TYPE *str, size_t length)
    return buf;
 }
 
-EAPI _STRBUF_STRUCT_NAME *
+EINA_API _STRBUF_STRUCT_NAME *
 _FUNC_EXPAND(manage_read_only_new_length)(const _STRBUF_DATA_TYPE *str, size_t length)
 {
    _STRBUF_STRUCT_NAME *buf =
@@ -83,7 +83,7 @@ _FUNC_EXPAND(manage_read_only_new_length)(const _STRBUF_DATA_TYPE *str, size_t l
    return buf;
 }
 
-EAPI void
+EINA_API void
 _FUNC_EXPAND(free)(_STRBUF_STRUCT_NAME *buf)
 {
    if (!buf) return ;
@@ -93,14 +93,14 @@ _FUNC_EXPAND(free)(_STRBUF_STRUCT_NAME *buf)
    eina_strbuf_common_free(buf);
 }
 
-EAPI void
+EINA_API void
 _FUNC_EXPAND(reset)(_STRBUF_STRUCT_NAME *buf)
 {
    EINA_MAGIC_CHECK_STRBUF(buf);
    eina_strbuf_common_reset(_STRBUF_CSIZE, buf);
 }
 
-EAPI Eina_Rw_Slice
+EINA_API Eina_Rw_Slice
 _FUNC_EXPAND(expand)(_STRBUF_STRUCT_NAME *buf, size_t minimum_unused_space)
 {
    Eina_Rw_Slice ret = {.len = 0, .mem = NULL};
@@ -108,28 +108,28 @@ _FUNC_EXPAND(expand)(_STRBUF_STRUCT_NAME *buf, size_t minimum_unused_space)
    return eina_strbuf_common_expand(_STRBUF_CSIZE, buf, minimum_unused_space);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(use)(_STRBUF_STRUCT_NAME *buf, size_t extra_bytes)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_use(buf, extra_bytes);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(append_length)(_STRBUF_STRUCT_NAME *buf, const _STRBUF_DATA_TYPE *str, size_t length)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_append_length(_STRBUF_CSIZE, buf, (const void *) str, length);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(append_slice)(_STRBUF_STRUCT_NAME *buf, const Eina_Slice slice)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_append_length(_STRBUF_CSIZE, buf, slice.mem, slice.len);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(append_buffer)(_STRBUF_STRUCT_NAME *buf, const _STRBUF_STRUCT_NAME *data)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
@@ -138,70 +138,70 @@ _FUNC_EXPAND(append_buffer)(_STRBUF_STRUCT_NAME *buf, const _STRBUF_STRUCT_NAME
    return eina_strbuf_common_append_length(_STRBUF_CSIZE, buf, (_STRBUF_DATA_TYPE *) eina_strbuf_common_string_get(data), eina_strbuf_common_length_get(data));
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(insert_length)(_STRBUF_STRUCT_NAME *buf, const _STRBUF_DATA_TYPE *str, size_t length, size_t pos)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_insert_length(_STRBUF_CSIZE, buf, (const void *) str, length, pos);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(insert_slice)(_STRBUF_STRUCT_NAME *buf, const Eina_Slice slice, size_t pos)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_insert_length(_STRBUF_CSIZE, buf, slice.mem, slice.len, pos);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(append_char)(_STRBUF_STRUCT_NAME *buf, _STRBUF_DATA_TYPE c)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_append_char(_STRBUF_CSIZE, buf, (const void *) &c);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(insert_char)(_STRBUF_STRUCT_NAME *buf, _STRBUF_DATA_TYPE c, size_t pos)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_insert_char(_STRBUF_CSIZE, buf, (const void *) &c, pos);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 _FUNC_EXPAND(remove)(_STRBUF_STRUCT_NAME *buf, size_t start, size_t end)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
    return eina_strbuf_common_remove(_STRBUF_CSIZE, buf, start, end);
 }
 
-EAPI const _STRBUF_DATA_TYPE *
+EINA_API const _STRBUF_DATA_TYPE *
 _FUNC_EXPAND(string_get)(const _STRBUF_STRUCT_NAME *buf)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, NULL);
    return (const _STRBUF_DATA_TYPE *) eina_strbuf_common_string_get(buf);
 }
 
-EAPI _STRBUF_DATA_TYPE *
+EINA_API _STRBUF_DATA_TYPE *
 _FUNC_EXPAND(string_steal)(_STRBUF_STRUCT_NAME *buf)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, NULL);
    return (_STRBUF_DATA_TYPE *) eina_strbuf_common_string_steal(_STRBUF_CSIZE, buf);
 }
 
-EAPI void
+EINA_API void
 _FUNC_EXPAND(string_free)(_STRBUF_STRUCT_NAME *buf)
 {
    EINA_MAGIC_CHECK_STRBUF(buf);
    eina_strbuf_common_string_free(_STRBUF_CSIZE, buf);
 }
 
-EAPI size_t
+EINA_API size_t
 _FUNC_EXPAND(length_get)(const _STRBUF_STRUCT_NAME *buf)
 {
    EINA_MAGIC_CHECK_STRBUF(buf, 0);
    return eina_strbuf_common_length_get(buf);
 }
 
-EAPI Eina_Slice
+EINA_API Eina_Slice
 _FUNC_EXPAND(slice_get)(const _STRBUF_STRUCT_NAME *buf)
 {
    Eina_Slice ret = {.len = 0, .mem = NULL};
@@ -209,7 +209,7 @@ _FUNC_EXPAND(slice_get)(const _STRBUF_STRUCT_NAME *buf)
    return eina_strbuf_common_slice_get(buf);
 }
 
-EAPI Eina_Rw_Slice
+EINA_API Eina_Rw_Slice
 _FUNC_EXPAND(rw_slice_get)(const _STRBUF_STRUCT_NAME *buf)
 {
    Eina_Rw_Slice ret = {.len = 0, .mem = NULL};
@@ -217,7 +217,7 @@ _FUNC_EXPAND(rw_slice_get)(const _STRBUF_STRUCT_NAME *buf)
    return eina_strbuf_common_rw_slice_get(buf);
 }
 
-EAPI _STRBUF_DATA_TYPE*
+EINA_API _STRBUF_DATA_TYPE*
 _FUNC_EXPAND(release)(_STRBUF_STRUCT_NAME *buf)
 {
    _STRBUF_DATA_TYPE *result;
diff --git a/src/lib/eina/eina_binshare.c b/src/lib/eina/eina_binshare.c
index 65edf841a4..84d0aa5208 100644
--- a/src/lib/eina/eina_binshare.c
+++ b/src/lib/eina/eina_binshare.c
@@ -83,7 +83,7 @@ static const char EINA_MAGIC_BINSHARE_NODE_STR[] = "Eina Binshare Node";
  *
  * @see eina_init()
  */
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_binshare_init(void)
 {
    Eina_Bool ret;
@@ -124,7 +124,7 @@ eina_binshare_init(void)
  *
  * @see eina_shutdown()
  */
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_binshare_shutdown(void)
 {
    Eina_Bool ret;
@@ -144,7 +144,7 @@ eina_binshare_shutdown(void)
  *                                   API                                      *
  *============================================================================*/
 
-EAPI void
+EINA_API void
 eina_binshare_del(const void *obj)
 {
    if (!obj)
@@ -154,7 +154,7 @@ eina_binshare_del(const void *obj)
      CRI("EEEK trying to del non-shared binshare %p", obj);
 }
 
-EAPI const void *
+EINA_API const void *
 eina_binshare_add_length(const void *obj, unsigned int olen)
 {
    return eina_share_common_add_length(binshare_share,
@@ -163,19 +163,19 @@ eina_binshare_add_length(const void *obj, unsigned int olen)
                                                      0);
 }
 
-EAPI const void *
+EINA_API const void *
 eina_binshare_ref(const void *obj)
 {
    return eina_share_common_ref(binshare_share, obj);
 }
 
-EAPI int
+EINA_API int
 eina_binshare_length(const void *obj)
 {
    return eina_share_common_length(binshare_share, obj);
 }
 
-EAPI void
+EINA_API void
 eina_binshare_dump(void)
 {
    eina_share_common_dump(binshare_share, NULL, 0);
diff --git a/src/lib/eina/eina_binshare.h b/src/lib/eina/eina_binshare.h
index 6caee100b1..31ec3cd237 100644
--- a/src/lib/eina/eina_binshare.h
+++ b/src/lib/eina/eina_binshare.h
@@ -93,7 +93,7 @@
  *
  * @see eina_binshare_add()
  */
-EAPI const void *eina_binshare_add_length(const void  *obj,
+EINA_API const void *eina_binshare_add_length(const void  *obj,
                                           unsigned int olen) EINA_WARN_UNUSED_RESULT;
 
 /**
@@ -110,7 +110,7 @@ EAPI const void *eina_binshare_add_length(const void  *obj,
  *
  * @note There is no unref since this is the work of eina_binshare_del().
  */
-EAPI const void *eina_binshare_ref(const void *obj);
+EINA_API const void *eina_binshare_ref(const void *obj);
 
 /**
  * @brief Notes that the given object has lost an instance.
@@ -125,7 +125,7 @@ EAPI const void *eina_binshare_ref(const void *obj);
  * @warning If the given pointer is not shared, bad things happen, mostly a
  *          segmentation fault.
  */
-EAPI void        eina_binshare_del(const void *obj);
+EINA_API void        eina_binshare_del(const void *obj);
 
 /**
  * @brief Notes that the given object @b must be shared.
@@ -138,7 +138,7 @@ EAPI void        eina_binshare_del(const void *obj);
  * @warning If the given pointer is not shared, bad things happen, mostly a
  *          segmentation fault. If in doubt, try strlen().
  */
-EAPI int         eina_binshare_length(const void *obj) EINA_WARN_UNUSED_RESULT EINA_PURE;
+EINA_API int         eina_binshare_length(const void *obj) EINA_WARN_UNUSED_RESULT EINA_PURE;
 
 /**
  * @brief Dumps the contents of share_common.
@@ -146,7 +146,7 @@ EAPI int         eina_binshare_length(const void *obj) EINA_WARN_UNUSED_RESULT E
  * @details This function dumps all the objects from share_common to stdout with a
  *          DDD: prefix per line and a memory usage summary.
  */
-EAPI void        eina_binshare_dump(void);
+EINA_API void        eina_binshare_dump(void);
 
 /**
  * @brief Retrieves an instance of a blob for use in a program.
diff --git a/src/lib/eina/eina_convert.c b/src/lib/eina/eina_convert.c
index 4683215df5..422459c00c 100644
--- a/src/lib/eina/eina_convert.c
+++ b/src/lib/eina/eina_convert.c
@@ -91,9 +91,9 @@ static inline void reverse(char s[], int length)
  * @cond LOCAL
  */
 
-EAPI Eina_Error EINA_ERROR_CONVERT_P_NOT_FOUND = 0;
-EAPI Eina_Error EINA_ERROR_CONVERT_0X_NOT_FOUND = 0;
-EAPI Eina_Error EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH = 0;
+EINA_API Eina_Error EINA_ERROR_CONVERT_P_NOT_FOUND = 0;
+EINA_API Eina_Error EINA_ERROR_CONVERT_0X_NOT_FOUND = 0;
+EINA_API Eina_Error EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH = 0;
 
 /**
  * @endcond
@@ -150,7 +150,7 @@ eina_convert_shutdown(void)
  * Come from the second edition of The C Programming Language ("K&R2") on page 64
  */
 
-EAPI int
+EINA_API int
 eina_convert_itoa(int n, char *s)
 {
    int i = 0;
@@ -175,7 +175,7 @@ eina_convert_itoa(int n, char *s)
    return i + r;
 }
 
-EAPI int
+EINA_API int
 eina_convert_xtoa(unsigned int n, char *s)
 {
    int i;
@@ -194,7 +194,7 @@ eina_convert_xtoa(unsigned int n, char *s)
    return i;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_convert_atod(const char *src, int length, long long *m, long *e)
 {
    const char *str = src;
@@ -286,7 +286,7 @@ on_length_error:
    return EINA_FALSE;
 }
 
-EAPI int
+EINA_API int
 eina_convert_dtoa(double d, char *des)
 {
    int length = 0;
@@ -350,7 +350,7 @@ eina_convert_dtoa(double d, char *des)
    return length + eina_convert_itoa(p, des);
 }
 
-EAPI int
+EINA_API int
 eina_convert_fptoa(Eina_F32p32 fp, char *des)
 {
    int length = 0;
@@ -434,7 +434,7 @@ eina_convert_fptoa(Eina_F32p32 fp, char *des)
    return length + eina_convert_itoa(p, des);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_convert_atofp(const char *src, int length, Eina_F32p32 *fp)
 {
    long long m;
@@ -468,7 +468,7 @@ eina_convert_atofp(const char *src, int length, Eina_F32p32 *fp)
  * No hexadecimal form supported
  * no sequence supported after NAN
  */
-EAPI double
+EINA_API double
 eina_convert_strtod_c(const char *nptr, char **endptr)
 {
    const char *iter;
diff --git a/src/lib/eina/eina_convert.h b/src/lib/eina/eina_convert.h
index 314cd4cf92..8c41ac74dd 100644
--- a/src/lib/eina/eina_convert.h
+++ b/src/lib/eina/eina_convert.h
@@ -158,9 +158,9 @@
  * @{
  */
 
-EAPI extern Eina_Error EINA_ERROR_CONVERT_P_NOT_FOUND; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
-EAPI extern Eina_Error EINA_ERROR_CONVERT_0X_NOT_FOUND; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
-EAPI extern Eina_Error EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
+EINA_API extern Eina_Error EINA_ERROR_CONVERT_P_NOT_FOUND; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
+EINA_API extern Eina_Error EINA_ERROR_CONVERT_0X_NOT_FOUND; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
+EINA_API extern Eina_Error EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
 
 /**
  * @brief Converts an integer number to a string in decimal base.
@@ -177,7 +177,7 @@ EAPI extern Eina_Error EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH; /**< Not used, p
  * The returned value is the length of the string, including the null
  * terminated character.
  */
-EAPI int       eina_convert_itoa(int n, char *s)  EINA_ARG_NONNULL(2);
+EINA_API int       eina_convert_itoa(int n, char *s)  EINA_ARG_NONNULL(2);
 
 /**
  * @brief Converts an integer number to a string in hexadecimal base.
@@ -195,7 +195,7 @@ EAPI int       eina_convert_itoa(int n, char *s)  EINA_ARG_NONNULL(2);
  * The returned value is the length of the string, including the nul
  * terminated character.
  */
-EAPI int       eina_convert_xtoa(unsigned int n, char *s) EINA_ARG_NONNULL(2);
+EINA_API int       eina_convert_xtoa(unsigned int n, char *s) EINA_ARG_NONNULL(2);
 
 
 /**
@@ -220,7 +220,7 @@ EAPI int       eina_convert_xtoa(unsigned int n, char *s) EINA_ARG_NONNULL(2);
  * The returned value is the length of the string, including the null
  * character.
  */
-EAPI int       eina_convert_dtoa(double d, char *des) EINA_ARG_NONNULL(2);
+EINA_API int       eina_convert_dtoa(double d, char *des) EINA_ARG_NONNULL(2);
 
 /**
  * @brief Converts a string to a double.
@@ -257,7 +257,7 @@ EAPI int       eina_convert_dtoa(double d, char *des) EINA_ARG_NONNULL(2);
  * If the string is invalid #EINA_FALSE is returned, otherwise #EINA_TRUE is
  * returned.
  */
-EAPI Eina_Bool eina_convert_atod(const char *src,
+EINA_API Eina_Bool eina_convert_atod(const char *src,
                                  int         length,
                                  long long  *m,
                                  long       *e) EINA_ARG_NONNULL(1, 3, 4);
@@ -289,7 +289,7 @@ EAPI Eina_Bool eina_convert_atod(const char *src,
  * implements the frexp() function for fixed point numbers and does
  * some optimization.
  */
-EAPI int       eina_convert_fptoa(Eina_F32p32 fp,
+EINA_API int       eina_convert_fptoa(Eina_F32p32 fp,
                                   char       *des) EINA_ARG_NONNULL(2);
 
 /**
@@ -329,7 +329,7 @@ EAPI int       eina_convert_fptoa(Eina_F32p32 fp,
  * @note The code uses eina_convert_atod() and do the correct bit
  * shift to compute the fixed point number.
  */
-EAPI Eina_Bool eina_convert_atofp(const char  *src,
+EINA_API Eina_Bool eina_convert_atofp(const char  *src,
                                   int          length,
                                   Eina_F32p32 *fp) EINA_ARG_NONNULL(1, 3);
 
@@ -347,7 +347,7 @@ EAPI Eina_Bool eina_convert_atofp(const char  *src,
  * without locale-dependency, this function can replace strtod.
  * For more information, please refer documents of strtod, strtod_l.
  */
-EAPI double eina_convert_strtod_c(const char *nptr, char **endptr);
+EINA_API double eina_convert_strtod_c(const char *nptr, char **endptr);
 
 /**
  * @}
diff --git a/src/lib/eina/eina_counter.c b/src/lib/eina/eina_counter.c
index 1143c566fa..dc89f28f33 100644
--- a/src/lib/eina/eina_counter.c
+++ b/src/lib/eina/eina_counter.c
@@ -113,7 +113,7 @@ _eina_counter_asiprintf(char *base, int *position, const char *format, ...)
  *                                   API                                      *
  *============================================================================*/
 
-EAPI Eina_Counter *
+EINA_API Eina_Counter *
 eina_counter_new(const char *name)
 {
    Eina_Counter *counter;
@@ -131,7 +131,7 @@ eina_counter_new(const char *name)
    return counter;
 }
 
-EAPI void
+EINA_API void
 eina_counter_free(Eina_Counter *counter)
 {
    EINA_SAFETY_ON_NULL_RETURN(counter);
@@ -147,7 +147,7 @@ eina_counter_free(Eina_Counter *counter)
    free(counter);
 }
 
-EAPI void
+EINA_API void
 eina_counter_start(Eina_Counter *counter)
 {
    Eina_Clock *clk;
@@ -165,7 +165,7 @@ eina_counter_start(Eina_Counter *counter)
    clk->start = tp;
 }
 
-EAPI void
+EINA_API void
 eina_counter_stop(Eina_Counter *counter, int specimen)
 {
    Eina_Clock *clk;
@@ -185,7 +185,7 @@ eina_counter_stop(Eina_Counter *counter, int specimen)
    clk->valid = EINA_TRUE;
 }
 
-EAPI char *
+EINA_API char *
 eina_counter_dump(Eina_Counter *counter)
 {
    Eina_Clock *clk;
diff --git a/src/lib/eina/eina_counter.h b/src/lib/eina/eina_counter.h
index 6cb15b982b..f498942d2e 100644
--- a/src/lib/eina/eina_counter.h
+++ b/src/lib/eina/eina_counter.h
@@ -124,7 +124,7 @@ typedef struct _Eina_Counter Eina_Counter;
  * @note When the new counter is not needed anymore, use eina_counter_free() to
  *       free the allocated memory.
  */
-EAPI Eina_Counter *eina_counter_new(const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EINA_API Eina_Counter *eina_counter_new(const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Deletes a counter.
@@ -135,7 +135,7 @@ EAPI Eina_Counter *eina_counter_new(const char *name) EINA_WARN_UNUSED_RESULT EI
  * @param[in] counter The counter to delete
  *
  */
-EAPI void          eina_counter_free(Eina_Counter *counter) EINA_ARG_NONNULL(1);
+EINA_API void          eina_counter_free(Eina_Counter *counter) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Starts the time count.
@@ -152,7 +152,7 @@ EAPI void          eina_counter_free(Eina_Counter *counter) EINA_ARG_NONNULL(1);
  * @note To stop the timing, eina_counter_stop() must be called with the
  *       same counter.
  */
-EAPI void          eina_counter_start(Eina_Counter *counter) EINA_ARG_NONNULL(1);
+EINA_API void          eina_counter_start(Eina_Counter *counter) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Stops the time count.
@@ -165,7 +165,7 @@ EAPI void          eina_counter_start(Eina_Counter *counter) EINA_ARG_NONNULL(1)
  * @param[in] specimen The number of the test
  *
  */
-EAPI void          eina_counter_stop(Eina_Counter *counter,
+EINA_API void          eina_counter_stop(Eina_Counter *counter,
                                      int           specimen) EINA_ARG_NONNULL(1);
 
 /**
@@ -185,7 +185,7 @@ EAPI void          eina_counter_stop(Eina_Counter *counter,
  *
  * @note The unit of time is nanoseconds.
  */
-EAPI char         *eina_counter_dump(Eina_Counter *counter) EINA_ARG_NONNULL(1);
+EINA_API char         *eina_counter_dump(Eina_Counter *counter) EINA_ARG_NONNULL(1);
 
 /**
  * @}
diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index 8737ff8e49..79c594a3f9 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -326,7 +326,7 @@ eina_cow_shutdown(void)
    return EINA_TRUE;
 }
 
-EAPI Eina_Cow *
+EINA_API Eina_Cow *
 eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, const void *default_value, Eina_Bool gc)
 {
    const char *choice, *tmp;
@@ -390,7 +390,7 @@ eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, cons
    return NULL;
 }
 
-EAPI void
+EINA_API void
 eina_cow_del(Eina_Cow *cow)
 {
    if (!cow) return;
@@ -405,7 +405,7 @@ eina_cow_del(Eina_Cow *cow)
    free(cow);
 }
 
-EAPI const Eina_Cow_Data *
+EINA_API const Eina_Cow_Data *
 eina_cow_alloc(Eina_Cow *cow)
 {
 #ifdef EINA_COW_MAGIC_ON
@@ -415,7 +415,7 @@ eina_cow_alloc(Eina_Cow *cow)
    return cow->default_value;
 }
 
-EAPI void
+EINA_API void
 eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data)
 {
    Eina_Cow_Ptr *ref;
@@ -451,7 +451,7 @@ eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data)
    eina_mempool_free(cow->pool, (void*) ref);
 }
 
-EAPI void *
+EINA_API void *
 eina_cow_write(Eina_Cow *cow,
                const Eina_Cow_Data * const *data)
 {
@@ -535,7 +535,7 @@ eina_cow_write(Eina_Cow *cow,
    return (void *) *data;
 }
 
-EAPI void
+EINA_API void
 eina_cow_done(Eina_Cow *cow,
               const Eina_Cow_Data * const * dst,
               const void *data,
@@ -569,7 +569,7 @@ eina_cow_done(Eina_Cow *cow,
    _eina_cow_togc_add(cow, ref, (const Eina_Cow_Data **) dst);
 }
 
-EAPI void
+EINA_API void
 eina_cow_memcpy(Eina_Cow *cow,
                 const Eina_Cow_Data * const *dst,
                 const Eina_Cow_Data *src)
@@ -603,7 +603,7 @@ eina_cow_memcpy(Eina_Cow *cow,
    *((const void**)dst) = src;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_cow_gc(Eina_Cow *cow)
 {
    Eina_Cow_GC *gc;
diff --git a/src/lib/eina/eina_cow.h b/src/lib/eina/eina_cow.h
index 4836d3e870..f5a6473978 100644
--- a/src/lib/eina/eina_cow.h
+++ b/src/lib/eina/eina_cow.h
@@ -61,14 +61,14 @@ typedef void Eina_Cow_Data;
  * @param[in] gc Is it possible to run garbage collection on this pool.
  * @return A valid new Eina_Cow, or @c NULL on error.
  */
-EAPI Eina_Cow *eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, const void *default_value, Eina_Bool gc) EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Cow *eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, const void *default_value, Eina_Bool gc) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Destroys an Eina_Cow pool and all the allocated memory.
  *
  * @param[in] cow The pool to destroy
  */
-EAPI void eina_cow_del(Eina_Cow *cow);
+EINA_API void eina_cow_del(Eina_Cow *cow);
 
 /**
  * @brief Returns an initialized pointer from the pool.
@@ -76,7 +76,7 @@ EAPI void eina_cow_del(Eina_Cow *cow);
  * @param[in] cow The pool to take things from.
  * @return A pointer to the new pool instance
  */
-EAPI const Eina_Cow_Data *eina_cow_alloc(Eina_Cow *cow) EINA_WARN_UNUSED_RESULT;
+EINA_API const Eina_Cow_Data *eina_cow_alloc(Eina_Cow *cow) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Frees a pointer from the pool.
@@ -87,7 +87,7 @@ EAPI const Eina_Cow_Data *eina_cow_alloc(Eina_Cow *cow) EINA_WARN_UNUSED_RESULT;
  * @note To simplify the caller code *data will point to the default
  * read only state after the call to this function.
  */
-EAPI void eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data);
+EINA_API void eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data);
 
 /**
  * @brief Gets a writeable pointer from a const pointer.
@@ -97,7 +97,7 @@ EAPI void eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data);
  *
  * @note This function is not thread safe.
  */
-EAPI void *eina_cow_write(Eina_Cow *cow,
+EINA_API void *eina_cow_write(Eina_Cow *cow,
                           const Eina_Cow_Data * const *src) EINA_WARN_UNUSED_RESULT;
 
 /**
@@ -110,7 +110,7 @@ EAPI void *eina_cow_write(Eina_Cow *cow,
  *
  * @note This function is not thread safe.
  */
-EAPI void eina_cow_done(Eina_Cow *cow,
+EINA_API void eina_cow_done(Eina_Cow *cow,
                         const Eina_Cow_Data * const *dst,
                         const void *data,
                         Eina_Bool needed_gc);
@@ -121,7 +121,7 @@ EAPI void eina_cow_done(Eina_Cow *cow,
  * @param[in] dst The destination to update.
  * @param[in] src The source of information to copy.
  */
-EAPI void eina_cow_memcpy(Eina_Cow *cow,
+EINA_API void eina_cow_memcpy(Eina_Cow *cow,
                           const Eina_Cow_Data * const *dst,
                           const Eina_Cow_Data *src);
 
@@ -135,7 +135,7 @@ EAPI void eina_cow_memcpy(Eina_Cow *cow,
  * It does run a hash function on all possible common structures trying to
  * find the one that matches and merge them into one pointer.
  */
-EAPI Eina_Bool eina_cow_gc(Eina_Cow *cow);
+EINA_API Eina_Bool eina_cow_gc(Eina_Cow *cow);
 
 /**
  * @def EINA_COW_WRITE_BEGIN
diff --git a/src/lib/eina/eina_cpu.c b/src/lib/eina/eina_cpu.c
index c61297803b..119b8d098d 100644
--- a/src/lib/eina/eina_cpu.c
+++ b/src/lib/eina/eina_cpu.c
@@ -165,7 +165,7 @@ _ppc_cpu_features(Eina_Cpu_Features *features)
 /* FIXME the features checks should be called when this function is called?
  * or make it static by doing eina_cpu_init() and return a local var
  */
-EAPI Eina_Cpu_Features eina_cpu_features = 0;
+EINA_API Eina_Cpu_Features eina_cpu_features = 0;
 
 Eina_Bool
 eina_cpu_init(void)
@@ -192,7 +192,7 @@ eina_cpu_shutdown(void)
  *
  * @return
  */
-EAPI Eina_Cpu_Features eina_cpu_features_get(void)
+EINA_API Eina_Cpu_Features eina_cpu_features_get(void)
 {
    return eina_cpu_features;
 }
@@ -302,13 +302,13 @@ _eina_page_size(void)
      }
 }
 
-EAPI int eina_cpu_page_size(void)
+EINA_API int eina_cpu_page_size(void)
 {
    if (_page_size == 0) _eina_page_size();
    return _page_size;
 }
 
-EAPI int eina_cpu_count(void)
+EINA_API int eina_cpu_count(void)
 {
    return _cpu_count;
 }
diff --git a/src/lib/eina/eina_cpu.h b/src/lib/eina/eina_cpu.h
index c5724ab2c5..c17d46e22b 100644
--- a/src/lib/eina/eina_cpu.h
+++ b/src/lib/eina/eina_cpu.h
@@ -64,14 +64,14 @@ typedef enum _Eina_Cpu_Features
  *
  * @return the current cpu features
  */
-EAPI extern Eina_Cpu_Features eina_cpu_features;
+EINA_API extern Eina_Cpu_Features eina_cpu_features;
 
 /**
  * @brief Cpu features accessor.
  *
  * @return the current cpu features
  */
-EAPI Eina_Cpu_Features eina_cpu_features_get(void);
+EINA_API Eina_Cpu_Features eina_cpu_features_get(void);
 
 /**
  * @brief Gets the current number of processors.
@@ -79,7 +79,7 @@ EAPI Eina_Cpu_Features eina_cpu_features_get(void);
  * @return The number of processors that are online, that
  * is available when the function is called.
  */
-EAPI int               eina_cpu_count(void);
+EINA_API int               eina_cpu_count(void);
 
 /**
  * @brief Gets the current virtual page size.
@@ -88,7 +88,7 @@ EAPI int               eina_cpu_count(void);
  * allocation performed by the operating system on behalf of the program, and
  * for transfers between the main memory and any other auxiliary store.
  */
-EAPI int               eina_cpu_page_size(void);
+EINA_API int               eina_cpu_page_size(void);
 
 /**
  * @brief Reverses the byte order of a 16-bit (destination) register.
diff --git a/src/lib/eina/eina_crc.c b/src/lib/eina/eina_crc.c
index 69d0b2341c..616d07931c 100644
--- a/src/lib/eina/eina_crc.c
+++ b/src/lib/eina/eina_crc.c
@@ -287,7 +287,7 @@ static const unsigned int table[8][256] =
    }
 };
 
-EAPI unsigned int
+EINA_API unsigned int
 _eina_crc(const char *data, int len, unsigned int seed, Eina_Bool start_stream)
 {
    unsigned int crc;
diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index c811c5fe2a..00e90ab995 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -142,7 +142,7 @@ static void _opcodes_register_all(Eina_Debug_Session *session);
 #endif
 static void _thread_start(Eina_Debug_Session *session);
 
-EAPI int
+EINA_API int
 eina_debug_session_send(Eina_Debug_Session *session, int dest, int op, void *data, int size)
 {
    Eina_Debug_Packet_Header hdr;
@@ -262,13 +262,13 @@ end:
 }
 #endif
 
-EAPI void
+EINA_API void
 eina_debug_disable()
 {
    _debug_disabled = EINA_TRUE;
 }
 
-EAPI void
+EINA_API void
 eina_debug_session_terminate(Eina_Debug_Session *session)
 {
    /* Close fd here so the thread terminates its own session by itself */
@@ -287,7 +287,7 @@ eina_debug_session_terminate(Eina_Debug_Session *session)
      }
 }
 
-EAPI void
+EINA_API void
 eina_debug_session_dispatch_override(Eina_Debug_Session *session, Eina_Debug_Dispatch_Cb disp_cb)
 {
    if (!session) return;
@@ -295,7 +295,7 @@ eina_debug_session_dispatch_override(Eina_Debug_Session *session, Eina_Debug_Dis
    session->dispatch_cb = disp_cb;
 }
 
-EAPI Eina_Debug_Dispatch_Cb
+EINA_API Eina_Debug_Dispatch_Cb
 eina_debug_session_dispatch_get(Eina_Debug_Session *session)
 {
    if (session) return session->dispatch_cb;
@@ -462,7 +462,7 @@ _session_create(int fd)
    return session;
 }
 
-EAPI Eina_Debug_Session *
+EINA_API Eina_Debug_Session *
 eina_debug_remote_connect(int port)
 {
    int fd;
@@ -492,7 +492,7 @@ err:
    return NULL;
 }
 
-EAPI Eina_Debug_Session *
+EINA_API Eina_Debug_Session *
 eina_debug_local_connect(Eina_Bool is_master)
 {
 #ifndef _WIN32
@@ -641,7 +641,7 @@ _thread_start(Eina_Debug_Session *session)
  * - Pointer to ops: returned in the response to determine which opcodes have been added
  * - List of opcode names separated by \0
  */
-EAPI void
+EINA_API void
 eina_debug_opcodes_register(Eina_Debug_Session *session, const Eina_Debug_Opcode ops[],
       Eina_Debug_Opcode_Status_Cb status_cb, void *data)
 {
@@ -663,7 +663,7 @@ eina_debug_opcodes_register(Eina_Debug_Session *session, const Eina_Debug_Opcode
       _opcodes_registration_send(session, info);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_debug_dispatch(Eina_Debug_Session *session, void *buffer)
 {
    Eina_Debug_Packet_Header *hdr = buffer;
@@ -688,13 +688,13 @@ eina_debug_dispatch(Eina_Debug_Session *session, void *buffer)
    return EINA_TRUE;
 }
 
-EAPI void
+EINA_API void
 eina_debug_session_data_set(Eina_Debug_Session *session, void *data)
 {
    if (session) session->data = data;
 }
 
-EAPI void *
+EINA_API void *
 eina_debug_session_data_get(Eina_Debug_Session *session)
 {
    if (session) return session->data;
@@ -750,7 +750,7 @@ eina_debug_shutdown(void)
    return EINA_TRUE;
 }
 
-EAPI void
+EINA_API void
 eina_debug_fork_reset(void)
 {
    extern Eina_Bool fork_resetting;
diff --git a/src/lib/eina/eina_debug.h b/src/lib/eina/eina_debug.h
index dbc36caf5d..a19d04d83a 100644
--- a/src/lib/eina/eina_debug.h
+++ b/src/lib/eina/eina_debug.h
@@ -162,7 +162,7 @@ typedef struct
  * of them.
  * Need to be invoked before eina_init. Otherwise it won't have any effect.
  */
-EAPI void eina_debug_disable(void);
+EINA_API void eina_debug_disable(void);
 
 /**
  * @brief Connect to the local daemon
@@ -171,7 +171,7 @@ EAPI void eina_debug_disable(void);
  *
  * @return The session on success or NULL otherwise.
  */
-EAPI Eina_Debug_Session *eina_debug_local_connect(Eina_Bool is_master);
+EINA_API Eina_Debug_Session *eina_debug_local_connect(Eina_Bool is_master);
 
 /**
  * @brief Connect to remote daemon
@@ -182,14 +182,14 @@ EAPI Eina_Debug_Session *eina_debug_local_connect(Eina_Bool is_master);
  *
  * @return The session on success or NULL otherwise.
  */
-EAPI Eina_Debug_Session *eina_debug_remote_connect(int port);
+EINA_API Eina_Debug_Session *eina_debug_remote_connect(int port);
 
 /**
  * @brief Terminate the session
  *
  * @param[in,out] session the session to terminate
  */
-EAPI void eina_debug_session_terminate(Eina_Debug_Session *session);
+EINA_API void eina_debug_session_terminate(Eina_Debug_Session *session);
 
 /**
  * @brief Override the dispatcher of a specific session
@@ -201,7 +201,7 @@ EAPI void eina_debug_session_terminate(Eina_Debug_Session *session);
  * @param[in,out] session the session
  * @param[in] disp_cb the new dispatcher for the given session
  */
-EAPI void eina_debug_session_dispatch_override(Eina_Debug_Session *session, Eina_Debug_Dispatch_Cb disp_cb);
+EINA_API void eina_debug_session_dispatch_override(Eina_Debug_Session *session, Eina_Debug_Dispatch_Cb disp_cb);
 
 /**
  * @brief Get the dispatcher of a specific session
@@ -210,7 +210,7 @@ EAPI void eina_debug_session_dispatch_override(Eina_Debug_Session *session, Eina
  *
  * @return The session dispatcher.
  */
-EAPI Eina_Debug_Dispatch_Cb eina_debug_session_dispatch_get(Eina_Debug_Session *session);
+EINA_API Eina_Debug_Dispatch_Cb eina_debug_session_dispatch_get(Eina_Debug_Session *session);
 
 /**
  * @brief Dispatch a given packet according to its header.
@@ -224,7 +224,7 @@ EAPI Eina_Debug_Dispatch_Cb eina_debug_session_dispatch_get(Eina_Debug_Session *
  *
  * @return True on success, false if the connection seems compromised.
  */
-EAPI Eina_Bool eina_debug_dispatch(Eina_Debug_Session *session, void *buffer);
+EINA_API Eina_Bool eina_debug_dispatch(Eina_Debug_Session *session, void *buffer);
 
 /**
  * @brief Set data to a session
@@ -232,7 +232,7 @@ EAPI Eina_Bool eina_debug_dispatch(Eina_Debug_Session *session, void *buffer);
  * @param[in,out] session the session
  * @param[in] data the data to set
  */
-EAPI void eina_debug_session_data_set(Eina_Debug_Session *session, void *data);
+EINA_API void eina_debug_session_data_set(Eina_Debug_Session *session, void *data);
 
 /**
  * @brief Get the data attached to a session
@@ -241,7 +241,7 @@ EAPI void eina_debug_session_data_set(Eina_Debug_Session *session, void *data);
  *
  * @return The data of the session.
  */
-EAPI void *eina_debug_session_data_get(Eina_Debug_Session *session);
+EINA_API void *eina_debug_session_data_get(Eina_Debug_Session *session);
 
 /**
  * @brief Register opcodes to a session
@@ -257,7 +257,7 @@ EAPI void *eina_debug_session_data_get(Eina_Debug_Session *session);
  * @param[in] status_cb a function to call when the opcodes are received
  * @param[in] status_data the data to give to status_cb
  */
-EAPI void eina_debug_opcodes_register(Eina_Debug_Session *session,
+EINA_API void eina_debug_opcodes_register(Eina_Debug_Session *session,
       const Eina_Debug_Opcode ops[],
       Eina_Debug_Opcode_Status_Cb status_cb, void *status_data);
 
@@ -274,7 +274,7 @@ EAPI void eina_debug_opcodes_register(Eina_Debug_Session *session,
  *
  * @return The number of sent bytes.
  */
-EAPI int eina_debug_session_send(Eina_Debug_Session *session, int dest_id, int op, void *data, int size);
+EINA_API int eina_debug_session_send(Eina_Debug_Session *session, int dest_id, int op, void *data, int size);
 
 /**
  * @brief Add a timer
@@ -285,7 +285,7 @@ EAPI int eina_debug_session_send(Eina_Debug_Session *session, int dest_id, int o
  *
  * @return The timer handle, NULL on error.
  */
-EAPI Eina_Debug_Timer *eina_debug_timer_add(unsigned int timeout_ms, Eina_Debug_Timer_Cb cb, void *data);
+EINA_API Eina_Debug_Timer *eina_debug_timer_add(unsigned int timeout_ms, Eina_Debug_Timer_Cb cb, void *data);
 
 /**
  * @brief Delete a timer
@@ -295,7 +295,7 @@ EAPI Eina_Debug_Timer *eina_debug_timer_add(unsigned int timeout_ms, Eina_Debug_
  * If the timer reaches the end and has not be renewed, trying to delete it will lead to a crash, as
  * it has already been deleted internally.
  */
-EAPI void eina_debug_timer_del(Eina_Debug_Timer *timer);
+EINA_API void eina_debug_timer_del(Eina_Debug_Timer *timer);
 
 /**
  * @brief Reset the eina debug system after forking
@@ -303,7 +303,7 @@ EAPI void eina_debug_timer_del(Eina_Debug_Timer *timer);
  * Call this any time the application forks
  * @since 1.21
  * */
-EAPI void eina_debug_fork_reset(void);
+EINA_API void eina_debug_fork_reset(void);
 /**
  * @}
  */
diff --git a/src/lib/eina/eina_debug_timer.c b/src/lib/eina/eina_debug_timer.c
index 8d03c0e57b..07cf6b1ef4 100644
--- a/src/lib/eina/eina_debug_timer.c
+++ b/src/lib/eina/eina_debug_timer.c
@@ -148,7 +148,7 @@ _monitor(void *_data EINA_UNUSED)
    return NULL;
 }
 
-EAPI Eina_Debug_Timer *
+EINA_API Eina_Debug_Timer *
 eina_debug_timer_add(unsigned int timeout_ms, Eina_Debug_Timer_Cb cb, void *data)
 {
    if (!cb || !timeout_ms) return NULL;
@@ -193,7 +193,7 @@ eina_debug_timer_add(unsigned int timeout_ms, Eina_Debug_Timer_Cb cb, void *data
    return t;
 }
 
-EAPI void
+EINA_API void
 eina_debug_timer_del(Eina_Debug_Timer *t)
 {
    eina_spinlock_take(&_lock);
diff --git a/src/lib/eina/eina_error.c b/src/lib/eina/eina_error.c
index b9f05a5a9d..43851728e5 100644
--- a/src/lib/eina/eina_error.c
+++ b/src/lib/eina/eina_error.c
@@ -138,7 +138,7 @@ static inline int strerror_r(int errnum, char *buf, size_t buflen)
  * @cond LOCAL
  */
 
-EAPI Eina_Error EINA_ERROR_OUT_OF_MEMORY = ENOMEM;
+EINA_API Eina_Error EINA_ERROR_OUT_OF_MEMORY = ENOMEM;
 
 /**
  * @endcond
@@ -225,7 +225,7 @@ eina_error_shutdown(void)
 *                                   API                                      *
 *============================================================================*/
 
-EAPI Eina_Error
+EINA_API Eina_Error
 eina_error_msg_register(const char *msg)
 {
    Eina_Error_Message *eem;
@@ -247,7 +247,7 @@ eina_error_msg_register(const char *msg)
    return EINA_ERROR_FROM_INDEX(_eina_errors_count); /* identifier = index + 1 (== _count). */
 }
 
-EAPI Eina_Error
+EINA_API Eina_Error
 eina_error_msg_static_register(const char *msg)
 {
    Eina_Error_Message *eem;
@@ -263,7 +263,7 @@ eina_error_msg_static_register(const char *msg)
    return EINA_ERROR_FROM_INDEX(_eina_errors_count); /* identifier = index + 1 (== _count). */
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_error_msg_modify(Eina_Error error, const char *msg)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(msg, EINA_FALSE);
@@ -291,7 +291,7 @@ eina_error_msg_modify(Eina_Error error, const char *msg)
    return EINA_TRUE;
 }
 
-EAPI const char *
+EINA_API const char *
 eina_error_msg_get(Eina_Error error)
 {
    if (!EINA_ERROR_REGISTERED_CHECK(error))
@@ -385,7 +385,7 @@ eina_error_msg_get(Eina_Error error)
    return _eina_errors[error - 1].string;
 }
 
-EAPI Eina_Error
+EINA_API Eina_Error
 eina_error_get(void)
 {
    if (eina_main_loop_is())
@@ -394,7 +394,7 @@ eina_error_get(void)
    return (Eina_Error)(uintptr_t) eina_tls_get(_eina_last_key);
 }
 
-EAPI void
+EINA_API void
 eina_error_set(Eina_Error err)
 {
    if (eina_main_loop_is())
@@ -403,7 +403,7 @@ eina_error_set(Eina_Error err)
      eina_tls_set(_eina_last_key, (void*)(uintptr_t) err);
 }
 
-EAPI Eina_Error
+EINA_API Eina_Error
 eina_error_find(const char *msg)
 {
    size_t i;
diff --git a/src/lib/eina/eina_error.h b/src/lib/eina/eina_error.h
index ba27bc67bc..3203924515 100644
--- a/src/lib/eina/eina_error.h
+++ b/src/lib/eina/eina_error.h
@@ -113,7 +113,7 @@ typedef Eina_Bool Eina_Success_Flag;
  *
  * @deprecated since 1.19, same as @c ENOMEM from @c errno.h
  */
-EAPI extern Eina_Error EINA_ERROR_OUT_OF_MEMORY EINA_DEPRECATED; /* use ENOMEM */
+EINA_API extern Eina_Error EINA_ERROR_OUT_OF_MEMORY EINA_DEPRECATED; /* use ENOMEM */
 
 /**
  * @brief Registers a new error type.
@@ -131,7 +131,7 @@ EAPI extern Eina_Error EINA_ERROR_OUT_OF_MEMORY EINA_DEPRECATED; /* use ENOMEM *
  *
  * @see eina_error_msg_static_register()
  */
-EAPI Eina_Error  eina_error_msg_register(const char *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Error  eina_error_msg_register(const char *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Registers a new error type, statically allocated message.
@@ -150,7 +150,7 @@ EAPI Eina_Error  eina_error_msg_register(const char *msg) EINA_ARG_NONNULL(1) EI
  *
  * @see eina_error_msg_register()
  */
-EAPI Eina_Error  eina_error_msg_static_register(const char *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EINA_API Eina_Error  eina_error_msg_static_register(const char *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Changes the message of an already registered message.
@@ -171,7 +171,7 @@ EAPI Eina_Error  eina_error_msg_static_register(const char *msg) EINA_ARG_NONNUL
  *
  * @see eina_error_msg_register()
  */
-EAPI Eina_Bool   eina_error_msg_modify(Eina_Error  error,
+EINA_API Eina_Bool   eina_error_msg_modify(Eina_Error  error,
                                        const char *msg) EINA_ARG_NONNULL(2);
 
 /**
@@ -183,7 +183,7 @@ EAPI Eina_Bool   eina_error_msg_modify(Eina_Error  error,
  *
  * @note This function is thread safe @since 1.10, but slower to use.
  */
-EAPI Eina_Error  eina_error_get(void);
+EINA_API Eina_Error  eina_error_get(void);
 
 /**
  * @brief Sets the last error.
@@ -197,7 +197,7 @@ EAPI Eina_Error  eina_error_get(void);
  *
  * @note This function is thread safe @since 1.10, but slower to use.
  */
-EAPI void        eina_error_set(Eina_Error err);
+EINA_API void        eina_error_set(Eina_Error err);
 
 /**
  * @brief Returns the description of the given error number.
@@ -208,7 +208,7 @@ EAPI void        eina_error_set(Eina_Error err);
  * @return The description of the error
  *
  */
-EAPI const char *eina_error_msg_get(Eina_Error error) EINA_PURE;
+EINA_API const char *eina_error_msg_get(Eina_Error error) EINA_PURE;
 
 /**
  * @brief Finds the #Eina_Error corresponding to a message string.
@@ -223,7 +223,7 @@ EAPI const char *eina_error_msg_get(Eina_Error error) EINA_PURE;
  *       eina_error_msg_static_register() or modified with
  *       eina_error_msg_modify().
  */
-EAPI Eina_Error  eina_error_find(const char *msg) EINA_ARG_NONNULL(1) EINA_PURE;
+EINA_API Eina_Error  eina_error_find(const char *msg) EINA_ARG_NONNULL(1) EINA_PURE;
 
 /**
  * @}
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index eb32dfc27b..c0fe64fe22 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -150,7 +150,7 @@ push_buf(Eina_Evlog_Buf *b, unsigned int size)
    return ptr;
 }
 
-EAPI void
+EINA_API void
 eina_evlog(const char *event, void *obj, double srctime, const char *detail)
 {
    Eina_Evlog_Item *item;
@@ -186,7 +186,7 @@ eina_evlog(const char *event, void *obj, double srctime, const char *detail)
    eina_spinlock_release(&_evlog_lock);
 }
 
-EAPI Eina_Evlog_Buf *
+EINA_API Eina_Evlog_Buf *
 eina_evlog_steal(void)
 {
    Eina_Evlog_Buf *stolen = NULL;
@@ -210,7 +210,7 @@ eina_evlog_steal(void)
    return stolen;
 }
 
-EAPI void
+EINA_API void
 eina_evlog_start(void)
 {
    eina_spinlock_take(&_evlog_lock);
@@ -224,7 +224,7 @@ eina_evlog_start(void)
    eina_spinlock_release(&_evlog_lock);
 }
 
-EAPI void
+EINA_API void
 eina_evlog_stop(void)
 {
    eina_spinlock_take(&_evlog_lock);
diff --git a/src/lib/eina/eina_evlog.h b/src/lib/eina/eina_evlog.h
index 6843602ff7..4c6a4255db 100644
--- a/src/lib/eina/eina_evlog.h
+++ b/src/lib/eina/eina_evlog.h
@@ -113,7 +113,7 @@ struct _Eina_Evlog_Buf
  *
  * @since 1.15
  */
-EAPI void
+EINA_API void
 eina_evlog(const char *event, void *obj, double srctime, const char *detail);
 
 /**
@@ -126,7 +126,7 @@ eina_evlog(const char *event, void *obj, double srctime, const char *detail);
  *
  * @since 1.15
  */
-EAPI Eina_Evlog_Buf *
+EINA_API Eina_Evlog_Buf *
 eina_evlog_steal(void);
 
 /**
@@ -134,7 +134,7 @@ eina_evlog_steal(void);
  *
  * @since 1.15
  */
-EAPI void
+EINA_API void
 eina_evlog_start(void);
 
 /**
@@ -145,7 +145,7 @@ eina_evlog_start(void);
  *
  * @since 1.15
  */
-EAPI void
+EINA_API void
 eina_evlog_stop(void);
 
 /**
diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h
index 7650884367..c7e5b2b590 100644
--- a/src/lib/eina/eina_file.h
+++ b/src/lib/eina/eina_file.h
@@ -264,7 +264,7 @@ struct _Eina_File_Line
  * @param[in] data The data to pass to the callback
  * @return #EINA_TRUE on success, otherwise #EINA_FALSE
  */
-EAPI Eina_Bool eina_file_dir_list(const char           *dir,
+EINA_API Eina_Bool eina_file_dir_list(const char           *dir,
                                   Eina_Bool             recursive,
                                   Eina_File_Dir_List_Cb cb,
                                   void                 *data) EINA_ARG_NONNULL(1, 3);
@@ -280,7 +280,7 @@ EAPI Eina_Bool eina_file_dir_list(const char           *dir,
  * @return An array of the parts of the path to split
  *
  */
-EAPI Eina_Array    *eina_file_split(char *path) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EINA_API Eina_Array    *eina_file_split(char *path) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @brief Gets an iterator to list the content of a directory.
@@ -300,7 +300,7 @@ EAPI Eina_Array    *eina_file_split(char *path) EINA_WARN_UNUSED_RESULT EINA_ARG
  *
  * @see eina_file_direct_ls()
  */
-EAPI Eina_Iterator *eina_file_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EINA_API Eina_Iterator *eina_file_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @brief Gets an iterator to list the content of a directory, with direct
@@ -327,7 +327,7 @@ EAPI Eina_Iterator *eina_file_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_A
  *
  * @see eina_file_direct_ls()
  */
-EAPI Eina_Iterator *eina_file_stat_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EINA_API Eina_Iterator *eina_file_stat_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @brief Uses information provided by #Eina_Iterator of eina_file_stat_ls() or eina_file_direct_ls()
@@ -345,7 +345,7 @@ EAPI Eina_Iterator *eina_file_stat_ls(const char *dir) EINA_WARN_UNUSED_RESULT E
  *
  * @since 1.2
  */
-EAPI int eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Stat *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2, 3);
+EINA_API int eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Stat *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2, 3);
 
 /**
  * @brief Close all file descriptors that are open at or above the given fd
@@ -362,7 +362,7 @@ EAPI int eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Sta
  *
  * @since 1.24
  */
-EAPI void eina_file_close_from(int fd, int *except_fd);
+EINA_API void eina_file_close_from(int fd, int *except_fd);
 
 /**
  * @brief Generates and creates a uniquely named temporary file from a template name.
@@ -393,7 +393,7 @@ EAPI void eina_file_close_from(int fd, int *except_fd);
  * @see eina_file_mkdtemp()
  * @since 1.8
  */
-EAPI int eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path) EINA_ARG_NONNULL(1);
+EINA_API int eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Generates and creates a uniquely named temporary directory from a template name.
@@ -417,7 +417,7 @@ EAPI int eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path) EINA_AR
  * @see eina_file_mkstemp()
  * @since 1.8
  */
-EAPI Eina_Bool eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path) EINA_ARG_NONNULL(1,2);
+EINA_API Eina_Bool eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path) EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Gets an iterator to list the content of a directory, with direct
@@ -446,7 +446,7 @@ EAPI Eina_Bool eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path) E
  *
  * @see eina_file_ls()
  */
-EAPI Eina_Iterator *eina_file_direct_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EINA_API Eina_Iterator *eina_file_direct_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @brief Sanitizes the file path.
@@ -460,7 +460,7 @@ EAPI Eina_Iterator *eina_file_direct_ls(const char *dir) EINA_WARN_UNUSED_RESULT
  *
  * @since 1.1
  */
-EAPI char *eina_file_path_sanitize(const char *path);
+EINA_API char *eina_file_path_sanitize(const char *path);
 
 /**
  * @typedef Eina_File_Copy_Progress
@@ -497,7 +497,7 @@ typedef enum {
  *
  * @note During the progress it may call back @p cb with the progress summary.
  */
-EAPI Eina_Bool eina_file_copy(const char *src, const char *dst, Eina_File_Copy_Flags flags, Eina_File_Copy_Progress cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
+EINA_API Eina_Bool eina_file_copy(const char *src, const char *dst, Eina_File_Copy_Flags flags, Eina_File_Copy_Progress cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @brief Gets a read-only handler to a file.
@@ -512,7 +512,7 @@ EAPI Eina_Bool eina_file_copy(const char *src, const char *dst, Eina_File_Copy_F
  *
  * @since 1.1
  */
-EAPI Eina_File *eina_file_open(const char *name, Eina_Bool shared) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EINA_API Eina_File *eina_file_open(const char *name, Eina_Bool shared) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @brief Creates a virtual file from a memory pointer.
@@ -525,7 +525,7 @@ EAPI Eina_File *eina_file_open(const char *name, Eina_Bool shared) EINA_WARN_UNU
  *
  * @since 1.8
  */
-EAPI Eina_File *
+EINA_API Eina_File *
 eina_file_virtualize(const char *virtual_name, const void *data, unsigned long long length, Eina_Bool copy) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
@@ -536,7 +536,7 @@ eina_file_virtualize(const char *virtual_name, const void *data, unsigned long l
  *
  * @since 1.8
  */
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_virtual(Eina_File *file) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
@@ -549,7 +549,7 @@ eina_file_virtual(Eina_File *file) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
  *
  * @since 1.8
  */
-EAPI Eina_Bool eina_file_refresh(Eina_File *file);
+EINA_API Eina_Bool eina_file_refresh(Eina_File *file);
 
 /**
  * @brief Duplicates a read-only handler of a previously open file.
@@ -561,7 +561,7 @@ EAPI Eina_Bool eina_file_refresh(Eina_File *file);
  *
  * @since 1.8
  */
-EAPI Eina_File * eina_file_dup(const Eina_File *file);
+EINA_API Eina_File * eina_file_dup(const Eina_File *file);
 
 /**
  * @brief Unrefs the file handler.
@@ -571,7 +571,7 @@ EAPI Eina_File * eina_file_dup(const Eina_File *file);
  *
  * @since 1.1
  */
-EAPI void eina_file_close(Eina_File *file);
+EINA_API void eina_file_close(Eina_File *file);
 
 /**
  * @brief Gets the file size at open time.
@@ -581,7 +581,7 @@ EAPI void eina_file_close(Eina_File *file);
  *
  * @since 1.1
  */
-EAPI size_t eina_file_size_get(const Eina_File *file);
+EINA_API size_t eina_file_size_get(const Eina_File *file);
 
 /**
  * @brief Gets the last modification time of an open file.
@@ -591,7 +591,7 @@ EAPI size_t eina_file_size_get(const Eina_File *file);
  *
  * @since 1.1
  */
-EAPI time_t eina_file_mtime_get(const Eina_File *file);
+EINA_API time_t eina_file_mtime_get(const Eina_File *file);
 
 /**
  * @brief Gets the filename of an open file.
@@ -601,7 +601,7 @@ EAPI time_t eina_file_mtime_get(const Eina_File *file);
  *
  * @since 1.1
  */
-EAPI const char *eina_file_filename_get(const Eina_File *file);
+EINA_API const char *eina_file_filename_get(const Eina_File *file);
 
 /**
  * @brief Gets the extended attribute of an open file.
@@ -614,7 +614,7 @@ EAPI const char *eina_file_filename_get(const Eina_File *file);
  *
  * @since 1.2
  */
-EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file);
+EINA_API Eina_Iterator *eina_file_xattr_get(Eina_File *file);
 
 /**
  * @brief Gets the extended attribute of an open file.
@@ -628,7 +628,7 @@ EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file);
  *
  * @since 1.2
  */
-EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file);
+EINA_API Eina_Iterator *eina_file_xattr_value_get(Eina_File *file);
 
 /**
  * @brief Maps all the files to a buffer.
@@ -640,7 +640,7 @@ EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file);
  *
  * @since 1.1
  */
-EAPI void *eina_file_map_all(Eina_File *file, Eina_File_Populate rule);
+EINA_API void *eina_file_map_all(Eina_File *file, Eina_File_Populate rule);
 
 /**
  * @brief Maps a part of the file.
@@ -656,7 +656,7 @@ EAPI void *eina_file_map_all(Eina_File *file, Eina_File_Populate rule);
  *
  * @since 1.1
  */
-EAPI void *eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
+EINA_API void *eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
                              unsigned long int offset, unsigned long int length);
 
 /**
@@ -667,7 +667,7 @@ EAPI void *eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
  *
  * @since 1.1
  */
-EAPI void eina_file_map_free(Eina_File *file, void *map);
+EINA_API void eina_file_map_free(Eina_File *file, void *map);
 
 /**
  * @brief Asks the OS to populate or otherwise pages of memory in file mapping.
@@ -683,7 +683,7 @@ EAPI void eina_file_map_free(Eina_File *file, void *map);
  *
  * @since 1.8
  */
-EAPI void
+EINA_API void
 eina_file_map_populate(Eina_File *file, Eina_File_Populate rule, const void *map,
                        unsigned long int offset, unsigned long int length);
 
@@ -698,7 +698,7 @@ eina_file_map_populate(Eina_File *file, Eina_File_Populate rule, const void *map
  *
  * @since 1.3
  */
-EAPI Eina_Iterator *eina_file_map_lines(Eina_File *file);
+EINA_API Eina_Iterator *eina_file_map_lines(Eina_File *file);
 
 /**
  * @brief Tells whether there has been an IO error during the life of a mmaped file.
@@ -709,7 +709,7 @@ EAPI Eina_Iterator *eina_file_map_lines(Eina_File *file);
  *
  * @since 1.2
  */
-EAPI Eina_Bool eina_file_map_faulted(Eina_File *file, void *map);
+EINA_API Eina_Bool eina_file_map_faulted(Eina_File *file, void *map);
 
 /**
  * @brief Joins two paths of known length.
@@ -768,7 +768,7 @@ static inline size_t eina_file_path_join(char *dst,
  *
  * @since 1.19
  */
-EAPI Eina_Bool eina_file_unlink(const char *pathname);
+EINA_API Eina_Bool eina_file_unlink(const char *pathname);
 
 /**
  * @brief Make sure a file descriptor will be closed on exec.
@@ -781,7 +781,7 @@ EAPI Eina_Bool eina_file_unlink(const char *pathname);
  *
  * @since 1.20
  */
-EAPI Eina_Bool eina_file_close_on_exec(int fd, Eina_Bool on);
+EINA_API Eina_Bool eina_file_close_on_exec(int fd, Eina_Bool on);
 
 #include "eina_inline_file.x"
 
@@ -796,26 +796,26 @@ typedef unsigned int Eina_Statgen;
  * @brief Force the stat generation counter to tick over so any following i/o does real i/o and stat calls
  * @since 1.23
  */
-EAPI void         eina_file_statgen_next(void);
+EINA_API void         eina_file_statgen_next(void);
 
 /**
  * @brief Get the current stat generation counter value
  * @return 0 if you should always do stat calls and compare, or some other value that changes like a generation counter
  * @since 1.23
  */
-EAPI Eina_Statgen eina_file_statgen_get(void);
+EINA_API Eina_Statgen eina_file_statgen_get(void);
 
 /**
  * @brief Enable stat generation count optimiziing to only stat/do file i/o between generation counts changing
  * @since 1.23
  */
-EAPI void         eina_file_statgen_enable(void);
+EINA_API void         eina_file_statgen_enable(void);
 
 /**
  * @brief Disable stat generation count optimiziing to only stat/do file i/o between generation counts changing
  * @since 1.23
  */
-EAPI void         eina_file_statgen_disable(void);
+EINA_API void         eina_file_statgen_disable(void);
 
 /**
  * @}
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index 70ac5384fb..d93d2ef7b7 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -73,7 +73,7 @@ Eina_Lock _eina_file_lock_cache;
 static Eina_Spinlock _eina_statgen_lock;
 static Eina_Statgen _eina_statgen = 0;
 
-EAPI void
+EINA_API void
 eina_file_statgen_next(void)
 {
    eina_spinlock_take(&_eina_statgen_lock);
@@ -85,7 +85,7 @@ eina_file_statgen_next(void)
    eina_spinlock_release(&_eina_statgen_lock);
 }
 
-EAPI Eina_Statgen
+EINA_API Eina_Statgen
 eina_file_statgen_get(void)
 {
    Eina_Statgen s;
@@ -95,7 +95,7 @@ eina_file_statgen_get(void)
    return s;
 }
 
-EAPI void
+EINA_API void
 eina_file_statgen_enable(void)
 {
    eina_spinlock_take(&_eina_statgen_lock);
@@ -103,7 +103,7 @@ eina_file_statgen_enable(void)
    eina_spinlock_release(&_eina_statgen_lock);
 }
 
-EAPI void
+EINA_API void
 eina_file_statgen_disable(void)
 {
    eina_spinlock_take(&_eina_statgen_lock);
@@ -405,7 +405,7 @@ _eina_file_map_close(Eina_File_Map *map)
 
 // Global API
 
-EAPI char *
+EINA_API char *
 eina_file_path_sanitize(const char *path)
 {
    Eina_Tmpstr *result = NULL;
@@ -430,7 +430,7 @@ eina_file_path_sanitize(const char *path)
    return r;
 }
 
-EAPI Eina_File *
+EINA_API Eina_File *
 eina_file_virtualize(const char *virtual_name, const void *data, unsigned long long length, Eina_Bool copy)
 {
    Eina_File *file;
@@ -494,7 +494,7 @@ eina_file_virtualize(const char *virtual_name, const void *data, unsigned long l
    return file;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_virtual(Eina_File *file)
 {
    if (!file) return EINA_FALSE;
@@ -502,7 +502,7 @@ eina_file_virtual(Eina_File *file)
    return file->virtual;
 }
 
-EAPI Eina_File *
+EINA_API Eina_File *
 eina_file_dup(const Eina_File *f)
 {
    Eina_File *file = (Eina_File*) f;
@@ -544,7 +544,7 @@ eina_file_clean_close(Eina_File *file)
    free(file);
 }
 
-EAPI void
+EINA_API void
 eina_file_close(Eina_File *file)
 {
    Eina_Bool leave = EINA_TRUE;
@@ -574,21 +574,21 @@ eina_file_close(Eina_File *file)
    eina_lock_release(&_eina_file_lock_cache);
 }
 
-EAPI size_t
+EINA_API size_t
 eina_file_size_get(const Eina_File *file)
 {
    EINA_FILE_MAGIC_CHECK(file, 0);
    return file->length;
 }
 
-EAPI time_t
+EINA_API time_t
 eina_file_mtime_get(const Eina_File *file)
 {
    EINA_FILE_MAGIC_CHECK(file, 0);
    return file->mtime;
 }
 
-EAPI const char *
+EINA_API const char *
 eina_file_filename_get(const Eina_File *file)
 {
    EINA_FILE_MAGIC_CHECK(file, NULL);
@@ -695,7 +695,7 @@ _eina_file_map_lines_iterator_free(Eina_Lines_Iterator *it)
    free(it);
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_file_map_lines(Eina_File *file)
 {
    Eina_Lines_Iterator *it;
@@ -952,7 +952,7 @@ _eina_file_copy_internal(int s, int d, off_t total, Eina_File_Copy_Progress cb,
    return ret;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_copy(const char *src, const char *dst, Eina_File_Copy_Flags flags, Eina_File_Copy_Progress cb, const void *cb_data)
 {
    struct stat st;
@@ -1055,7 +1055,7 @@ eina_file_shutdown(void)
    return EINA_TRUE;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_close_on_exec(int fd, Eina_Bool on)
 {
 #ifdef _WIN32
diff --git a/src/lib/eina/eina_file_posix.c b/src/lib/eina/eina_file_posix.c
index 72f0e510fe..c8b4c56919 100644
--- a/src/lib/eina/eina_file_posix.c
+++ b/src/lib/eina/eina_file_posix.c
@@ -562,7 +562,7 @@ eina_file_cleanup(Eina_Tmpstr *path)
 
 
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_dir_list(const char *dir,
                    Eina_Bool recursive,
                    Eina_File_Dir_List_Cb cb,
@@ -594,7 +594,7 @@ eina_file_dir_list(const char *dir,
    return EINA_TRUE;
 }
 
-EAPI Eina_Array *
+EINA_API Eina_Array *
 eina_file_split(char *path)
 {
    Eina_Array *ea;
@@ -627,7 +627,7 @@ eina_file_split(char *path)
    return ea;
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_file_ls(const char *dir)
 {
 #ifdef HAVE_DIRENT_H
@@ -675,7 +675,7 @@ eina_file_ls(const char *dir)
 #endif
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_file_direct_ls(const char *dir)
 {
 #ifdef HAVE_DIRENT_H
@@ -735,7 +735,7 @@ eina_file_direct_ls(const char *dir)
 #endif
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_file_stat_ls(const char *dir)
 {
 #ifdef HAVE_DIRENT_H
@@ -795,7 +795,7 @@ eina_file_stat_ls(const char *dir)
 #endif
 }
 
-EAPI Eina_File *
+EINA_API Eina_File *
 eina_file_open(const char *path, Eina_Bool shared)
 {
    Eina_File *file;
@@ -904,7 +904,7 @@ eina_file_open(const char *path, Eina_Bool shared)
    return NULL;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_refresh(Eina_File *file)
 {
    struct stat file_stat;
@@ -937,7 +937,7 @@ eina_file_refresh(Eina_File *file)
    return r;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_unlink(const char *pathname)
 {
    if ( unlink(pathname) < 0)
@@ -947,7 +947,7 @@ eina_file_unlink(const char *pathname)
    return EINA_TRUE;
 }
 
-EAPI void *
+EINA_API void *
 eina_file_map_all(Eina_File *file, Eina_File_Populate rule)
 {
    int flags = MAP_SHARED;
@@ -998,7 +998,7 @@ eina_file_map_all(Eina_File *file, Eina_File_Populate rule)
    return ret;
 }
 
-EAPI void *
+EINA_API void *
 eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
                   unsigned long int offset, unsigned long int length)
 {
@@ -1077,7 +1077,7 @@ eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
    return NULL;
 }
 
-EAPI void
+EINA_API void
 eina_file_map_free(Eina_File *file, void *map)
 {
    EINA_SAFETY_ON_NULL_RETURN(file);
@@ -1108,7 +1108,7 @@ eina_file_map_free(Eina_File *file, void *map)
    eina_lock_release(&file->lock);
 }
 
-EAPI void
+EINA_API void
 eina_file_map_populate(Eina_File *file, Eina_File_Populate rule, const void *map,
                        unsigned long int offset, unsigned long int length)
 {
@@ -1123,7 +1123,7 @@ eina_file_map_populate(Eina_File *file, Eina_File_Populate rule, const void *map
    eina_lock_release(&file->lock);
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_map_faulted(Eina_File *file, void *map)
 {
    Eina_Bool r = EINA_FALSE;
@@ -1165,7 +1165,7 @@ eina_file_map_faulted(Eina_File *file, void *map)
    return r;
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_file_xattr_get(Eina_File *file)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL);
@@ -1175,7 +1175,7 @@ eina_file_xattr_get(Eina_File *file)
    return eina_xattr_fd_ls(file->fd);
 }
 
-EAPI Eina_Iterator *
+EINA_API Eina_Iterator *
 eina_file_xattr_value_get(Eina_File *file)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL);
@@ -1185,7 +1185,7 @@ eina_file_xattr_value_get(Eina_File *file)
    return eina_xattr_value_fd_ls(file->fd);
 }
 
-EAPI int
+EINA_API int
 eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Stat *st)
 {
    struct stat buf;
@@ -1312,7 +1312,7 @@ typedef struct
 } Dirent;
 #endif
 
-EAPI void
+EINA_API void
 eina_file_close_from(int fd, int *except_fd)
 {
 #if defined(_WIN32)
@@ -1510,7 +1510,7 @@ skip3:
 #endif
 }
 
-EAPI int
+EINA_API int
 eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path)
 {
    char buffer[PATH_MAX];
@@ -1556,7 +1556,7 @@ eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path)
    return fd;
 }
 
-EAPI Eina_Bool
+EINA_API Eina_Bool
 eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path)
 {
    char buffer[PATH_MAX];
diff --git a/src/lib/eina/eina_file_win32.c b/src/lib/eina/eina_file_win32.c
index b5c0c418c0..455d583b96 100644
--- a/src/lib/eina/eina_file_win32.c
+++ b/src/lib/eina/eina_file_win32.c
@@ -559,7 +559,7 @@ eina_file_cleanup(Eina_Tmpstr *path)
  *                                   API                                      *