538 files changed, 7857 insertions, 7226 deletions
diff --git a/.travis.yml b/.travis.yml
index da9cd21705..a66ea7a47e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,6 @@ env:
 jobs:
  include:
-    - os: osx
    - os: linux
      env: DISTRO=Fedora32-mingw CI_BUILD_TYPE=mingw
    - os: linux
@@ -77,9 +76,6 @@ jobs:
      env: DISTRO=Fedora32 CI_BUILD_TYPE=asan
    - os: linux
      if: type = cron
-      env: DISTRO=Fedora32-exactness CI_BUILD_TYPE=exactness
-    - os: linux
-      if: type = cron
      env: CI_BUILD_TYPE=codecov
    - os: linux
      if: type = cron
diff --git a/README b/README
index ec3b27a737..03085056d3 100644
--- a/README
+++ b/README
@@ -404,6 +404,15 @@ This library acts as a porting library for Windows to provide missing
 libc calls not in Mingw32 that EFL needs.
+**Heif:**
+//LGPL v3 license//
+The license doesnt affect efl or apps using efl, but gpl3 or lgpl3
+affects the entire os requiring any gpl/lgpl3 component be
+user-replacable.
+The end user must be able to modify the libheif code and still be
+able to use the efl.
 COMPILING AND INSTALLING
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index dc15cbe08f..02c484f978 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -132,19 +132,6 @@ group { name: "e/widgets/border/default/border";
   images.image: "screen_circular_shadow.png" COMP;
   images.image: "win_shadow.png" COMP;
   data.item: "shadow" "1";
-   script {
-      public message(Msg_Type:type, id, ...) {
-         new text[128];
-         new ncpu, cpu, mem;
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            ncpu = getarg(2);
-            cpu = getarg(3) / ncpu;
-            mem = getarg(4);
-            snprintf(text, 128, "%i%% %i.%iM", cpu, mem / 1024, (mem % 1024) / 100)
-            set_text(PART:"e.procstats.text", text);
-         }
-      }
-   }
   parts {
      part { name: "shadow_clip"; type: RECT; mouse_events: 0;
         description { state: "default";
@@ -683,29 +670,27 @@ group { name: "e/widgets/border/default/border";
            aspect: 1.0 1.0; aspect_preference: VERTICAL;
         }
     }
-     part { name: "e.procstats.text"; type: TEXT;
+     part { name: "e.procstats.swallow"; type: SWALLOW;
         scale: 1.0;
         repeat_events: 1;
         description { state: "default" 0.0;
+            fixed: 1 0;
            rel1.to: "procstats";
-            rel1.relative: 2.0 0.0;
            rel2.to: "procstats";
-            rel2.relative: 2.0 1.0;
+            rel2.relative: 1.0 1.0;
            rel2.offset: 0.0 -1;
-            visible: 1;
+            align: 0.0 0.5;
-            text {
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-               size: 9;
+            visible: 0;
-               font: FNBD;
-               min: 1 1;
-               ellipsis: -1;
-               text_class: "menu_item";
-               align: 0.0 0.5;
-             }
         }
         description { state: "hidden";
            visible: 0;
         }
-      }
+         description { state: "visible";
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+     }
   }
   programs {
      program {
@@ -842,14 +827,15 @@ group { name: "e/widgets/border/default/border";
      }
      program {
         signal: "e,state,procstats,on"; source: "e";
-         action: STATE_SET "default" 0.0;
+         action: STATE_SET "visible" 0.0;
-         target: "e.procstats.text";
+         target: "e.procstats.swallow";
      }
      program {
         signal: "e,state,procstats,off"; source: "e";
         action: STATE_SET "hidden" 0.0;
-         target: "e.procstats.text";
+         target: "e.procstats.swallow";
      }
 //      program {
 //         signal: "e,action,maximize"; source: "e";
 //      }
diff --git a/data/elementary/themes/edc/elm/progress.edc b/data/elementary/themes/edc/elm/progress.edc
index 71291323c9..38443ace30 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -210,6 +210,7 @@ group { name: "elm/progressbar/horizontal/default";
      part { name: "inside";
         scale: 1;
         description { state: "default" 0.0;
+            fixed: 1 1;
            min: 4 4;
            rel1.to: "ins0";
            rel1.relative: 1.0 (6/16);
diff --git a/data/evas/evas.xml b/data/evas/evas.xml
new file mode 100644
index 0000000000..7764c0c05e
--- /dev/null
+++ b/data/evas/evas.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+>------<mime-type type="image/heif">
+>------>-------<comment>HEIF image file</comment>
+>------>-------<glob pattern="*.heif"/>
+>------>-------<glob pattern="*.heic"/>
+>------</mime-type>
+>------<mime-type type="image/avif">
+>------>-------<comment>AVIF image file</comment>
+>------>--------<glob pattern="*.avif"/>
+>------</mime-type>
+</mime-info>
diff --git a/data/evas/meson.build b/data/evas/meson.build
new file mode 100644
index 0000000000..ddcc57dcad
--- /dev/null
+++ b/data/evas/meson.build
@@ -0,0 +1,4 @@
+install_data(files('evas.xml'),
+  install_dir : join_paths(dir_data, 'mime', 'packages')
+)
diff --git a/data/meson.build b/data/meson.build
index 4e1f68d406..5944dad07c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
-checkme_files = ['ecore', 'ecore_imf', 'ecore_x', 'eeze', 'efreet', 'elua', 'emotion', 'ethumb', 'ethumb_client', 'evas']
+checkme_files = ['ecore', 'ecore_imf', 'ecore_x', 'eeze', 'efreet', 'elua', 'emotion', 'ethumb', 'ethumb_client']
 foreach checkme : checkme_files
  install_data(join_paths(checkme, 'checkme'),
    install_dir : join_paths(dir_data, checkme)
@@ -10,3 +10,4 @@ subdir('edje')
 subdir('embryo')
 subdir(join_paths('ethumb', 'frames'))
 subdir('elementary')
+subdir('evas')
diff --git a/header_checks/meson.build b/header_checks/meson.build
index c71fdbf216..2f0205f28a 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -113,6 +113,7 @@ function_checks = [
  ['dlopen', ['dlfcn.h'],                               ['dl']],
  ['dlsym', ['dlfcn.h'],                                ['dl']],
  ['lround', ['math.h'],                                ['m']],
+  ['mallinfo2', ['malloc.h'],                            ['malloc']],
  ['mallinfo', ['malloc.h'],                            ['malloc']],
  ['shm_open', ['sys/mman.h', 'sys/stat.h', 'fcntl.h'], ['rt']],
 #from here on we specify arguments
diff --git a/meson_options.txt b/meson_options.txt
index f5ffb0e134..b224179366 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -189,8 +189,8 @@ option('unmount-path',
 option('evas-loaders-disabler',
  type : 'array',
  description : 'List of modular image/vector loaders to disable in efl',
-  choices : ['', 'gst', 'pdf', 'ps', 'raw', 'svg', 'rsvg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json', 'avif'],
+  choices : ['', 'gst', 'pdf', 'ps', 'raw', 'svg', 'rsvg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json', 'avif', 'heif'],
-  value : ['json', 'avif']
+  value : ['json', 'avif', 'heif']
 )
 option('ecore-imf-loaders-disabler',
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 63378d6033..aa3cec94a5 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -7,8 +7,8 @@
 #define MY_CLASS SIMPLE_CLASS
-EOAPI const Efl_Event_Description _SIMPLE_FOO = EFL_EVENT_DESCRIPTION("foo");
+const Efl_Event_Description _SIMPLE_FOO = EFL_EVENT_DESCRIPTION("foo");
-EOAPI const Efl_Event_Description _SIMPLE_BAR = EFL_EVENT_DESCRIPTION("bar");
+const Efl_Event_Description _SIMPLE_BAR = EFL_EVENT_DESCRIPTION("bar");
 static void
 _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int times)
@@ -19,7 +19,7 @@ _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int ti
     }
 }
-EAPI EFL_VOID_FUNC_BODYV(simple_other_call, EFL_FUNC_CALL(other, times), Eo *other, int times);
+EFL_VOID_FUNC_BODYV(simple_other_call, EFL_FUNC_CALL(other, times), Eo *other, int times);
 static void
 _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
@@ -28,7 +28,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
   pd->a = a;
 }
-EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
+EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
 static Eina_Bool
 _class_initializer(Efl_Class *klass)
diff --git a/src/benchmarks/eo/class_simple.h b/src/benchmarks/eo/class_simple.h
index 8445116963..56c92c0aba 100644
--- a/src/benchmarks/eo/class_simple.h
+++ b/src/benchmarks/eo/class_simple.h
@@ -6,16 +6,16 @@ typedef struct
   int a;
 } Simple_Public_Data;
-EAPI void simple_a_set(Eo *self, int a);
+void simple_a_set(Eo *self, int a);
 /* Calls simple_other_call(other, obj) and then simple_other_call(obj, other)
 * for 'times' times in order to grow the call stack on other objects. */
-EAPI void simple_other_call(Eo*self, Eo *other, int times);
+void simple_other_call(Eo*self, Eo *other, int times);
 #define SIMPLE_CLASS simple_class_get()
 const Efl_Class *simple_class_get(void);
-EOAPI extern const Efl_Event_Description _SIMPLE_FOO;
+extern const Efl_Event_Description _SIMPLE_FOO;
-EOAPI extern const Efl_Event_Description _SIMPLE_BAR;
+extern const Efl_Event_Description _SIMPLE_BAR;
 #define SIMPLE_FOO (&(_SIMPLE_FOO))
 #define SIMPLE_BAR (&(_SIMPLE_BAR))
diff --git a/src/bin/elementary/config.c b/src/bin/elementary/config.c
index ff05307700..1131437849 100644
--- a/src/bin/elementary/config.c
+++ b/src/bin/elementary/config.c
@@ -1591,7 +1591,9 @@ _icon_preview_icon_add(const char *icon, const char *theme)
   elm_box_pack_end(icon_preview_frame, ic);
   evas_object_show(ic);
-   if (strcmp(theme, ELM_CONFIG_ICON_THEME_ELEMENTARY))
+   if (!strcmp(theme, ELM_CONFIG_ICON_THEME_ELEMENTARY))
+     elm_icon_standard_set(ic, icon);
+   else
     elm_image_file_set(ic, efreet_icon_path_find(theme, icon, 48), NULL);
 }
@@ -1602,9 +1604,9 @@ _icon_preview_update(Evas_Object *win)
   const char **example_icon, *example_icons[] =
   {
      "folder",
-      "user-home",
+      "video-display",
-      "text-x-generic",
+      "mail-unread",
-      "system-run",
+      "start-here",
      "preferences-system",
      NULL,
   };
@@ -4414,25 +4416,25 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
        else if ((!strcmp(arg, "-t")) && (i < eina_array_count(arge->argv)))
          {
             i++;
-             theme_set = arg;
+             theme_set = eina_array_data_get(arge->argv, i);
             interactive = 0;
          }
        else if ((!strcmp(arg, "-f")) && (i < eina_array_count(arge->argv)))
          {
             i++;
-             finger_size_set = arg;
+             finger_size_set = eina_array_data_get(arge->argv, i);
             interactive = 0;
          }
        else if ((!strcmp(arg, "-s")) && (i < eina_array_count(arge->argv)))
          {
             i++;
-             scale_set = arg;
+             scale_set = eina_array_data_get(arge->argv, i);
             interactive = 0;
          }
        else if ((!strcmp(arg, "-w")) && (i < eina_array_count(arge->argv)))
          {
             i++;
-             web_backend = arg;
+             web_backend = eina_array_data_get(arge->argv, i);
             interactive = 0;
          }
     }
diff --git a/src/bin/elementary/test_genlist.c b/src/bin/elementary/test_genlist.c
index bf6ba4c9d9..41ff4a3903 100644
--- a/src/bin/elementary/test_genlist.c
+++ b/src/bin/elementary/test_genlist.c
@@ -292,6 +292,24 @@ _gl_selected(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 }
 static void
+_gl_unselected(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   printf("unselected: %p\n", event_info);
+}
+static void
+_gl_highlighted(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   printf("highlighted: %p\n", event_info);
+}
+static void
+_gl_unhighlighted(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   printf("unhighlighted: %p\n", event_info);
+}
+static void
 _gl_double_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
   printf("double clicked: %p\n", event_info);
@@ -445,6 +463,9 @@ test_genlist(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
   gl = elm_genlist_add(win);
   evas_object_smart_callback_add(gl, "selected", _gl_selected, NULL);
+   evas_object_smart_callback_add(gl, "unselected", _gl_unselected, NULL);
+   evas_object_smart_callback_add(gl, "highlighted", _gl_highlighted, NULL);
+   evas_object_smart_callback_add(gl, "unhighlighted", _gl_unhighlighted, NULL);
   evas_object_smart_callback_add(gl, "clicked,double", _gl_double_clicked, NULL);
   evas_object_smart_callback_add(gl, "clicked,right", _gl_right_clicked, NULL);
   evas_object_smart_callback_add(gl, "longpressed", _gl_longpress, NULL);
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 6292fb4259..ebca0c9b75 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -1,6 +1,8 @@
 #include "main.h"
 #include "docs.h"
+extern char* _eolian_api_symbol;
 static const char *
 _get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir)
 {
@@ -118,7 +120,7 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
        eina_strbuf_append_char(buf, '\n');
        eina_strbuf_free(dbuf);
     }
-   eina_strbuf_append(buf, "EOAPI ");
+   eina_strbuf_append_printf(buf, "%s %s_WEAK ", _eolian_api_symbol, _eolian_api_symbol);
   if (rtp)
     {
        if (!rtps)
@@ -225,7 +227,8 @@ eo_gen_header_gen(const Eolian_State *state, const Eolian_Class *cl,
   eina_strbuf_append_printf(buf, "#define %s %s()\n\n", mname, gname);
   eina_stringshare_del(mname);
-   eina_strbuf_append_printf(buf, "EWAPI const Efl_Class *%s(void) EINA_CONST;\n", gname);
+   eina_strbuf_append_printf(buf, "%s %s_WEAK const Efl_Class *%s(void) EINA_CONST;\n",
+                             _eolian_api_symbol, _eolian_api_symbol, gname);
   eina_stringshare_del(gname);
   /* method section */
@@ -283,8 +286,9 @@ events:
        if (!eolian_event_is_beta(ev) && evs == EOLIAN_SCOPE_PUBLIC)
          eina_strbuf_append_char(buf, '\n');
-        eina_strbuf_append_printf(buf, "EWAPI extern const "
+        eina_strbuf_append_printf(buf, "%s %s_WEAK extern const "
-                                  "Efl_Event_Description _%s;\n\n", evn);
+                                  "Efl_Event_Description _%s;\n\n",
+                                  _eolian_api_symbol, _eolian_api_symbol, evn);
        Eina_Strbuf *evdbuf = eo_gen_docs_event_gen(state, ev,
           eolian_class_c_name_get(cl));
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 8e965e25b2..b2167ef62d 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -7,6 +7,7 @@
 #include "sources.h"
 int _eolian_gen_log_dom = -1;
+char* _eolian_api_symbol;
 enum
 {
@@ -44,6 +45,7 @@ _print_usage(const char *progn, FILE *outf)
                 "  -o type:name  specify a particular output filename\n"
                 "  -h            print this message and exit\n"
                 "  -v            print version and exit\n"
+                 "  -e            api symbol string to be used for import/export symbol"
                 "\n"
                 "Available types:\n"
                 "  h: C header file (.eo.h/.eot.h)\n"
@@ -494,6 +496,7 @@ main(int argc, char **argv)
     NULL, NULL, NULL, NULL, NULL, NULL
   };
   char *basen = NULL;
+   _eolian_api_symbol = strdup("EAPI");
   Eina_List *includes = NULL;
   eina_init();
@@ -514,7 +517,7 @@ main(int argc, char **argv)
   int gen_what = 0;
   Eina_Bool scan_system = EINA_TRUE;
-   for (int opt; (opt = getopt(argc, argv, "SI:g:o:hv")) != -1;)
+   for (int opt; (opt = getopt(argc, argv, "SI:g:o:hve:")) != -1;)
     switch (opt)
       {
        case 0:
@@ -526,6 +529,10 @@ main(int argc, char **argv)
          /* just a pointer to argv contents, so it persists */
          includes = eina_list_append(includes, optarg);
          break;
+        case 'e':
+          free(_eolian_api_symbol);
+          _eolian_api_symbol = strdup(optarg);
+          break;
        case 'g':
          for (const char *wstr = optarg; *wstr; ++wstr)
            switch (*wstr)
@@ -665,6 +672,8 @@ end:
     free(outs[i]);
   free(basen);
+   free(_eolian_api_symbol);
+   
   eolian_state_free(eos);
   eolian_shutdown();
   eina_shutdown();
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index e5e8eb7a8b..543d7c8f51 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -7,6 +7,7 @@
 */
 static Eina_Hash *_funcs_params_init_get = NULL;
 static Eina_Hash *_funcs_params_init_set = NULL;
+extern char* _eolian_api_symbol;
 static const char *
 _get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir)
@@ -475,7 +476,8 @@ static void
 _emit_class_function(Eina_Strbuf *buf, const Eolian_Function *fid, const Eolian_Function_Type ftype, const Eolian_Type *rtp, const char *rtpn, Eina_Strbuf *params_full,
                     const char *ocnamel, const char *func_suffix, Eina_Strbuf *params, const char *function_name)
 {
-   eina_strbuf_append(buf, "EOAPI ");
+   eina_strbuf_append_printf(buf, "%s %s_WEAK", _eolian_api_symbol, _eolian_api_symbol);
+   eina_strbuf_append(buf, " ");
   eina_strbuf_append(buf, rtpn);
   eina_strbuf_append(buf, " ");
   eina_strbuf_append(buf, function_name);
@@ -894,7 +896,8 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
             eina_strbuf_append_printf(buf, "}\n\n");
          }
-        eina_strbuf_append(buf, "EOAPI EFL_");
+        eina_strbuf_append_printf(buf, "%s %s_WEAK", _eolian_api_symbol, _eolian_api_symbol);
+        eina_strbuf_append(buf, " EFL_");
        if (!strcmp(rtpn, "void"))
          eina_strbuf_append(buf, "VOID_");
        eina_strbuf_append(buf, "FUNC_BODY");
@@ -1125,7 +1128,8 @@ eo_gen_source_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
      EINA_ITERATOR_FOREACH(itr, ev)
        {
           Eina_Stringshare *evn = eolian_event_c_macro_get(ev);
-           eina_strbuf_append(buf, "EWAPI const Efl_Event_Description _");
+           eina_strbuf_append_printf(buf, "%s %s_WEAK", _eolian_api_symbol, _eolian_api_symbol);
+           eina_strbuf_append(buf, " const Efl_Event_Description _");
           eina_strbuf_append(buf, evn);
           eina_strbuf_append(buf, " =\n   EFL_EVENT_DESCRIPTION");
           if (eolian_event_is_hot(ev))
diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index 9b44279d98..897da96e36 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -4,6 +4,8 @@
 #include "headers.h"
 #include "docs.h"
+extern char* _eolian_api_symbol;
 static Eina_Strbuf *
 _type_generate(const Eolian_State *state, const Eolian_Typedecl *tp,
               Eina_Bool full)
@@ -226,7 +228,8 @@ _err_generate(const Eolian_State *state, const Eolian_Error *err)
   if (!buf) buf = eina_strbuf_new();
   else eina_strbuf_append_char(buf, '\n');
-   eina_strbuf_prepend_printf(buf, "EWAPI Eina_Error %s_get(void);\n\n", fn);
+   eina_strbuf_prepend_printf(buf, "%s %s_WEAK Eina_Error %s_get(void);\n\n",
+                              _eolian_api_symbol, _eolian_api_symbol, fn);
   char *ufn = strdup(fn);
   eina_str_toupper(&ufn);
@@ -324,7 +327,8 @@ _source_gen_error(Eina_Strbuf *buf, const Eolian_Error *err)
     *p = '_';
   eina_str_tolower(&fn);
-   eina_strbuf_append_printf(buf, "EWAPI Eina_Error %s_get(void)\n{\n", fn);
+   eina_strbuf_append_printf(buf, "%s %s_WEAK Eina_Error %s_get(void)\n{\n",
+                             _eolian_api_symbol, _eolian_api_symbol, fn);
   free(fn);
   const char *msg = eolian_error_message_get(err);
diff --git a/src/bindings/mono/efl_mono/efl_libs.cs.in b/src/bindings/mono/efl_mono/efl_libs.cs.in
index fcf5b18183..af811d494a 100644
--- a/src/bindings/mono/efl_mono/efl_libs.cs.in
+++ b/src/bindings/mono/efl_mono/efl_libs.cs.in
@@ -33,7 +33,7 @@ internal class Libs {
    internal const string CustomExports = "@CUSTOM_EXPORTS_MONO_DL_MONO@";
-    internal const string Libdl = "libdl.so";
+    internal const string Libdl = "@LIBDL_DL_MONO@";
    internal const string Kernel32 = "kernel32.dll";
    internal static readonly Efl.Eo.NativeModule EflModule = new Efl.Eo.NativeModule(Efl);
diff --git a/src/bindings/mono/efl_mono/meson.build b/src/bindings/mono/efl_mono/meson.build
index 165b6d55bd..5ca6f116d6 100644
--- a/src/bindings/mono/efl_mono/meson.build
+++ b/src/bindings/mono/efl_mono/meson.build
@@ -16,6 +16,11 @@ efl_libs = configuration_data()
 efl_libs.set('EFL_MONO_LIBRARY_MAP', map)
 efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'eflcustomexportsmono')
 efl_libs.set('EVIL_DL_MONO', 'dl')
+if sys_osx
+  efl_libs.set('LIBDL_DL_MONO', 'dl.dylib')
+else
+  efl_libs.set('LIBDL_DL_MONO', 'libdl.so')
+endif
 foreach mono_libs : mono_sublibs
  key = mono_libs[0].to_upper()+'_DL_MONO'
diff --git a/src/bindings/mono/eina_mono/eina_error.cs b/src/bindings/mono/eina_mono/eina_error.cs
index 1300e796ab..004792fdb7 100644
--- a/src/bindings/mono/eina_mono/eina_error.cs
+++ b/src/bindings/mono/eina_mono/eina_error.cs
@@ -59,11 +59,27 @@ public struct Error : IComparable<Error>, IEquatable<Error>
    /// <para>Since EFL 1.23.</para>
    /// </summary>
    public static readonly Error ENOENT = new Error(2);
+    /// <summary>
+    /// Return architecture independent ECANCELED error code.
+    /// Returns 125 for Linux, 89 for OSX and 105 for Windows.
+    /// <para>Since EFL 1.25.</para>
+    /// </summary>
+    private static int IndependentECANCELED()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            return new Error(125);
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            return new Error(89);
+        else // Windows
+            return new Error(105);
+    }
    /// <summary>
    /// Cancelled error identifier.
    /// <para>Since EFL 1.23.</para>
    /// </summary>
-    public static readonly Error ECANCELED = new Error(125);
+    public static readonly Error ECANCELED = IndependentECANCELED();
    /// <summary>
    /// Constructor.
diff --git a/src/bindings/mono/eo_mono/NativeModule_Unix.cs b/src/bindings/mono/eo_mono/NativeModule_Unix.cs
index 67409e02d1..b4dfeb8aea 100644
--- a/src/bindings/mono/eo_mono/NativeModule_Unix.cs
+++ b/src/bindings/mono/eo_mono/NativeModule_Unix.cs
@@ -56,6 +56,12 @@ internal partial class NativeModule
    ///<item>
    ///<description><c>libfilename.so</c></description>
    ///</item>
+    ///<item>
+    ///<description><c>filename.dylib</c></description>
+    ///</item>
+    ///<item>
+    ///<description><c>libfilename.dylib</c></description>
+    ///</item>
    ///</list>
    ///</summary>
    ///<param name="filename">The name to search for.</param>
@@ -73,6 +79,16 @@ internal partial class NativeModule
                if (r == IntPtr.Zero)
                {
                    r = dlopen("lib" + filename + ".so", RTLD_NOW | RTLD_GLOBAL);
+                    if (r == IntPtr.Zero)
+                    {
+                        r = dlopen(filename + ".dylib", RTLD_NOW | RTLD_GLOBAL);
+                        if (r == IntPtr.Zero)
+                        {
+                            r = dlopen("lib" + filename + ".dylib", RTLD_NOW | RTLD_GLOBAL);
+                        }
+                    }
                }
            }
        }
diff --git a/src/generic/evas/common/timeout.c b/src/generic/evas/common/timeout.c
index 844884c8e0..1b05a7db56 100644
--- a/src/generic/evas/common/timeout.c
+++ b/src/generic/evas/common/timeout.c
@@ -1,3 +1,6 @@
+#include <stdio.h>
+static void (*timeout_func) (void) = NULL;
 #ifdef _WIN32
 # include <stdio.h>
 # include <windows.h>
@@ -8,6 +11,7 @@ _timeout(void *arg)
 {
   int s = (int)(uintptr_t)arg;
   Sleep(s * 1000);
+   if (timeout_func) timeout_func();
   _Exit(-1);
   _endthreadex(0);
   return 0;
@@ -26,6 +30,7 @@ timeout_init(int seconds)
 static void
 _timeout(int val)
 {
+   if (timeout_func) timeout_func();
   _exit(-1);
   if (val) return;
 }
@@ -37,3 +42,9 @@ timeout_init(int seconds)
   alarm(seconds);
 }
 #endif
+void
+timeout_func_set(void (*func) (void))
+{
+   timeout_func = func;
+}
diff --git a/src/generic/evas/common/timeout.h b/src/generic/evas/common/timeout.h
index 2ea039badf..5cd4c8b54d 100644
--- a/src/generic/evas/common/timeout.h
+++ b/src/generic/evas/common/timeout.h
@@ -6,6 +6,7 @@ extern "C" {
 #endif
 void timeout_init(int seconds);
+void timeout_func_set(void (*func) (void));
 #ifdef __cplusplus
 }
diff --git a/src/generic/evas/pdf/main.cpp b/src/generic/evas/pdf/main.cpp
index c7c3ee13bd..5c70bfef21 100644
--- a/src/generic/evas/pdf/main.cpp
+++ b/src/generic/evas/pdf/main.cpp
@@ -18,6 +18,11 @@
 #include "shmfile.h"
 #include "timeout.h"
+#ifndef _WIN32
+# include <unistd.h>
+# include <signal.h>
+#endif
 #define DATA32 unsigned int
 typedef char RGB24[3];
@@ -192,11 +197,43 @@ void poppler_load_image(int size_w EINA_UNUSED, int size_h EINA_UNUSED)
   delete renderer;
 }
+static Eina_Tmpstr *tmpdir = NULL;
+static Eina_Tmpstr *generated = NULL;
+static void
+tmp_cleanup(void)
+{
+   if (tmpdir)
+     {
+        if (generated)
+          {
+             unlink(generated);
+          }
+        if (rmdir(tmpdir) < 0)
+          {
+             D("Failed to delete tmpdir %s\n", tmpdir);
+          }
+        eina_tmpstr_del(tmpdir);
+        tmpdir = NULL;
+        if (generated)
+          {
+             eina_tmpstr_del(generated);
+             generated = NULL;
+          }
+     }
+}
+static void
+_crash(int val)
+{
+   D("Crash\n");
+   tmp_cleanup();
+   _exit(-1 | val);
+}
 int
 main(int argc, char **argv)
 {
-   Eina_Tmpstr *tmpdir = NULL;
-   Eina_Tmpstr *generated = NULL;
   char *extension;
   char *dir;
   char *file;
@@ -204,6 +241,7 @@ main(int argc, char **argv)
   int size_w = 0, size_h = 0;
   int head_only = 0;
   int page_num = 0;
+   int ret = 0;
   if (argc < 2) return -1;
   // file is ALWAYS first arg, other options come after
@@ -247,6 +285,18 @@ main(int argc, char **argv)
   dir = dirname(argv[0]);
   if (extension && dir && strcmp(extension, ".pdf"))
     {
+#ifndef _WIN32
+        signal(SIGSEGV, _crash);
+        signal(SIGBUS, _crash);
+        signal(SIGFPE, _crash);
+        signal(SIGABRT, _crash);
+        signal(SIGILL, _crash);
+        signal(SIGSYS, _crash);
+        signal(SIGINT, _crash);
+        signal(SIGTERM, _crash);
+        signal(SIGQUIT, _crash);
+#endif
+        timeout_func_set(tmp_cleanup);
        if (eina_file_mkdtemp("evas_generic_pdf_loaderXXXXXX", &tmpdir))
          {
             Eina_Strbuf *tmp;
@@ -270,6 +320,7 @@ main(int argc, char **argv)
                  pclose(cmd);
                  filename = basename(file);
                  generated = eina_tmpstr_add_length(filename, strlen(filename) - strlen(extension));
                  eina_strbuf_append_printf(tmp, "%s/%s.pdf", tmpdir, generated);
@@ -291,12 +342,15 @@ main(int argc, char **argv)
     }
   // Let's force a timeout if things go wrong
-   timeout_init(10);
+   timeout_init(30);
   // Now process the pdf (or the generated pdf)
   D("poppler_file_init\n");
   if (!poppler_init(file, page_num, size_w, size_h))
-     return -1;
+     {
+        goto cleanup;
+        ret = 1;
+     }
   D("poppler_file_init done\n");
   D("dpi2...: %f\n", dpi);
@@ -338,18 +392,9 @@ main(int argc, char **argv)
     printf("done\n");
   poppler_shutdown();
+cleanup:
-   if (tmpdir)
+   timeout_func_set(NULL);
-     {
+   tmp_cleanup();
-        if (generated) unlink(generated);
-        if (rmdir(tmpdir) < 0)
-          {
-             D("Failed to delete tmpdir %s\n", tmpdir);
-          }
-        eina_tmpstr_del(tmpdir);
-        eina_tmpstr_del(generated);
-     }
   fflush(stdout);
-   return 0;
+   return ret;
 }
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 0d79b621b2..0b4ba4a8fd 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -32,8 +32,8 @@
 #include "ecore_private.h"
 #include "../../static_libs/buildsystem/buildsystem.h"
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
-#include <malloc.h>
+# include <malloc.h>
 #endif
 #ifndef O_BINARY
@@ -45,14 +45,19 @@ EAPI Ecore_Version *ecore_version = &_version;
 EAPI double _efl_startup_time = 0;
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
-#define KEEP_MAX(Global, Local) \
+# define KEEP_MAX(Global, Local) \
-  if (Global < (Local))         \
+   if (Global < (Local))         \
-    Global = Local;
+       Global = Local;
 static Eina_Bool _ecore_memory_statistic(void *data);
+# ifdef HAVE_MALLINFO2
+static size_t _ecore_memory_max_total = 0;
+static size_t _ecore_memory_max_free = 0;
+# else
 static int _ecore_memory_max_total = 0;
 static int _ecore_memory_max_free = 0;
+# endif
 static pid_t _ecore_memory_pid = 0;
 #ifdef HAVE_MALLOC_INFO
 static FILE *_ecore_memory_statistic_file = NULL;
@@ -291,7 +296,7 @@ ecore_init(void)
   if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
 #endif
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
   if (getenv("ECORE_MEM_STAT"))
     {
 #ifdef HAVE_MALLOC_INFO
@@ -432,16 +437,22 @@ ecore_shutdown(void)
     _ecore_main_loop_shutdown();
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
     if (getenv("ECORE_MEM_STAT"))
       {
          _ecore_memory_statistic(NULL);
+          #ifdef HAVE_MALLINFO2
+          ERR("[%i] Memory MAX total: %lu, free: %lu",
+              _ecore_memory_pid,
+              _ecore_memory_max_total,
+              _ecore_memory_max_free);
+          #else
          ERR("[%i] Memory MAX total: %i, free: %i",
              _ecore_memory_pid,
              _ecore_memory_max_total,
              _ecore_memory_max_free);
+          #endif
 #ifdef HAVE_MALLOC_INFO
          fclose(_ecore_memory_statistic_file);
@@ -963,20 +974,30 @@ _systemd_watchdog_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
 }
 #endif
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
 static Eina_Bool
 _ecore_memory_statistic(EINA_UNUSED void *data)
 {
 #ifdef HAVE_MALLOC_INFO
   static int frame = 0;
 #endif
-#ifdef HAVE_MALLINFO
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
+   Eina_Bool changed = EINA_FALSE;
+# if defined(HAVE_MALLINFO2)
+   struct mallinfo2 mi;
+   static size_t uordblks = 0;
+   static size_t fordblks = 0;
+   mi = mallinfo2();
+# else
   struct mallinfo mi;
   static int uordblks = 0;
   static int fordblks = 0;
-   Eina_Bool changed = EINA_FALSE;
   mi = mallinfo();
+# endif
 #define HAS_CHANGED(Global, Local) \
  if (Global != Local)             \
@@ -989,14 +1010,24 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
   HAS_CHANGED(fordblks, mi.fordblks);
   if (changed)
-     ERR("[%i] Memory total: %i, free: %i",
+     {
-         _ecore_memory_pid,
+#ifdef HAVE_MALLINFO2
-         mi.uordblks,
+        ERR("[%i] Memory total: %lu, free: %lu",
-         mi.fordblks);
+            _ecore_memory_pid,
+            mi.uordblks,
+            mi.fordblks);
+#else
+        ERR("[%i] Memory total: %i, free: %i",
+            _ecore_memory_pid,
+            mi.uordblks,
+            mi.fordblks);
+#endif
+     }
   KEEP_MAX(_ecore_memory_max_total, mi.uordblks);
   KEEP_MAX(_ecore_memory_max_free, mi.fordblks);
 #endif
 #ifdef HAVE_MALLOC_INFO
   if (frame) fputs("\n", _ecore_memory_statistic_file);
   malloc_info(0, _ecore_memory_statistic_file);
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index efd5310029..a037916e3a 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -327,7 +327,7 @@ _ecore_main_pre_idle_exit(void)
   // even if we never go idle, keep up flushing some of our freeq away
   // on every idle exit which may happen if we even never called idlers
   // for now an idea but dont enforce
-//   eina_freeq_reduce(eina_freeq_main_get(), 128);
+   eina_freeq_reduce(eina_freeq_main_get(), 128);
 }
 #ifdef HAVE_LIBUV
diff --git a/src/lib/ecore/efl_core_proc_env.c b/src/lib/ecore/efl_core_proc_env.c
index f693df25af..9177d822f1 100644
--- a/src/lib/ecore/efl_core_proc_env.c
+++ b/src/lib/ecore/efl_core_proc_env.c
@@ -16,7 +16,7 @@
 #if defined (__FreeBSD__) || defined (__OpenBSD__)
 # include <dlfcn.h>
 static char ***_dl_environ;
-#else
+#elif !defined(_MSC_VER)
 extern char **environ;
 #endif
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 726a4b36a0..d85d5b1661 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -140,7 +140,11 @@ efl_loop_exit_code_process(Eina_Value *value)
        eina_value_setup(&v, EINA_VALUE_TYPE_INT);
        if (!eina_value_convert(value, &v)) r = -1;
-        else eina_value_get(&v, &r);
+        else
+          {
+             if (!eina_value_get(&v, &r))
+               r = -1;
+          }
     }
   else
     {
diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h
index 717c36c3fd..35b59d3c6e 100644
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@@ -4,30 +4,32 @@
 #include <Eina.h>
 #include <Eo.h>
-#ifdef EAPI
+#ifdef ECORE_AUDIO_API
-#undef EAPI
+#error ECORE_AUDIO_API should not be already defined
 #endif
 #ifdef _WIN32
-# ifdef EFL_BUILD
+# ifndef ECORE_AUDIO_STATIC
-#  ifdef DLL_EXPORT
+#  ifdef ECORE_AUDIO_BUILD
-#   define EAPI __declspec(dllexport)
+#   define ECORE_AUDIO_API __declspec(dllexport)
 #  else
-#   define EAPI
+#   define ECORE_AUDIO_API __declspec(dllimport)
 #  endif
 # else
-#  define EAPI __declspec(dllimport)
+#  define ECORE_AUDIO_API
 # endif
-#else
+# define ECORE_AUDIO_API_WEAK
-# ifdef __GNUC__
+#elif __GNUC__
-#  if __GNUC__ >= 4
+# if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
+#  define ECORE_AUDIO_API __attribute__ ((visibility("default")))
-#  else
+#  define ECORE_AUDIO_API_WEAK __attribute__ ((weak))
-#   define EAPI
-#  endif
 # else
-#  define EAPI
+#  define ECORE_AUDIO_API
+#  define ECORE_AUDIO_API_WEAK
 # endif
+#else
+# define ECORE_AUDIO_API
+# define ECORE_AUDIO_API_WEAK
 #endif
 /**
@@ -176,7 +178,7 @@ typedef struct _Ecore_Audio_Vio Ecore_Audio_Vio;
 * When Ecore_Audio is not used anymore, call ecore_audio_shutdown()
 * to shut down the Ecore_Audio library.
 */
-EAPI int                 ecore_audio_init(void);
+ECORE_AUDIO_API int                 ecore_audio_init(void);
 /**
 * @brief Shuts down the Ecore_Audio library.
@@ -190,7 +192,7 @@ EAPI int                 ecore_audio_init(void);
 * been called the same number of times than ecore_audio_init(). In that case
 * it shuts down all the services it uses.
 */
-EAPI int                 ecore_audio_shutdown(void);
+ECORE_AUDIO_API int                 ecore_audio_shutdown(void);
 //Legacy compatibility code
@@ -200,14 +202,14 @@ EAPI int                 ecore_audio_shutdown(void);
 * @since 1.8
 *
 */
-EAPI const char*         ecore_audio_obj_name_get(const Efl_Object* obj);
+ECORE_AUDIO_API const char*         ecore_audio_obj_name_get(const Efl_Object* obj);
 /**
 * @brief Name of the object
 *
 * @since 1.8
 *
 */
-EAPI void                ecore_audio_obj_name_set(Efl_Object* obj, const char *name);
+ECORE_AUDIO_API void                ecore_audio_obj_name_set(Efl_Object* obj, const char *name);
 #include <ecore_audio_obj.h>
 #include <ecore_audio_obj_in.h>
@@ -230,7 +232,4 @@ EAPI void                ecore_audio_obj_name_set(Efl_Object* obj, const char *n
 }
 #endif
-#undef EAPI
-#define EAPI
 #endif
diff --git a/src/lib/ecore_audio/ecore_audio.c b/src/lib/ecore_audio/ecore_audio.c
index be2e40c74c..91bf99b364 100644
--- a/src/lib/ecore_audio/ecore_audio.c
+++ b/src/lib/ecore_audio/ecore_audio.c
@@ -27,7 +27,7 @@ Ecore_Audio_Lib_Sndfile *ecore_audio_sndfile_lib = NULL;
 /* externally accessible functions */
-EAPI int
+ECORE_AUDIO_API int
 ecore_audio_init(void)
 {
@@ -60,7 +60,7 @@ ecore_audio_init(void)
   return _ecore_audio_init_count;
 }
-EAPI int
+ECORE_AUDIO_API int
 ecore_audio_shutdown(void)
 {
   DBG("Ecore_Audio shutdown");
@@ -263,13 +263,13 @@ ecore_audio_sndfile_lib_unload(void)
 #endif /* HAVE_SNDFILE */
-EAPI const char*
+ECORE_AUDIO_API const char*
 ecore_audio_obj_name_get(const Efl_Object* obj)
 {
   return efl_name_get(obj);
 }
-EAPI void
+ECORE_AUDIO_API void
 ecore_audio_obj_name_set(Efl_Object* obj, const char *name)
 {
   efl_name_set(obj, name);
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index 0376968a4b..95ffddf5b5 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -24,6 +24,7 @@ foreach eo_file : pub_eo_files
                           '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
                           '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
                           '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+                           '-e', 'ECORE_AUDIO_API',
                           '-gchd', '@INPUT@'])
 endforeach
@@ -80,7 +81,7 @@ endif
 ecore_audio_lib = library('ecore_audio',
    ecore_audio_src, pub_eo_file_target,
-    c_args : package_c_args,
+    c_args : [package_c_args, '-DECORE_AUDIO_BUILD'],
    dependencies: ecore_audio_pub_deps + ecore_audio_deps + ecore_audio_ext_deps,
    include_directories : config_dir,
    install: true,
diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index 6155796200..2945b06a8f 100644
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@ -15,31 +15,7 @@
 #include "Efl_Net.h"
 #endif
-#ifdef EAPI
+#include <ecore_con_api.h>
-# undef EAPI
-#endif
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
 /**
 * @defgroup Ecore_Con_Group Ecore_Con - Connection functions
@@ -633,51 +609,51 @@ struct _Ecore_Con_Event_Url_Progress
 };
 /** A client has connected to the server. */
-EAPI extern int ECORE_CON_EVENT_CLIENT_ADD;
+ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_ADD;
 /** A client has disconnected from the server. */
-EAPI extern int ECORE_CON_EVENT_CLIENT_DEL;
+ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_DEL;
 /** A client experienced an error.
 * @since 1.1
 */
-EAPI extern int ECORE_CON_EVENT_CLIENT_ERROR;
+ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_ERROR;
 /** A client connection has been upgraded to SSL.
 * @since 1.1
 */
-EAPI extern int ECORE_CON_EVENT_CLIENT_UPGRADE;
+ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_UPGRADE;
 /** A server was created. */
-EAPI extern int ECORE_CON_EVENT_SERVER_ADD;
+ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_ADD;
 /** A server connection was lost. */
-EAPI extern int ECORE_CON_EVENT_SERVER_DEL;
+ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_DEL;
 /** A server experienced an error.
 * @since 1.1
 */
-EAPI extern int ECORE_CON_EVENT_SERVER_ERROR;
+ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_ERROR;
 /** A server connection has been upgraded to SSL.
 * @since 1.1
 */
-EAPI extern int ECORE_CON_EVENT_SERVER_UPGRADE;
+ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_UPGRADE;
 /** A server connection has sent data to its client.
 * @since 1.1
 */
-EAPI extern int ECORE_CON_EVENT_CLIENT_WRITE;
+ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_WRITE;
 /** A server connection object has sent data.
 * @since 1.1
 */
-EAPI extern int ECORE_CON_EVENT_SERVER_WRITE;
+ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_WRITE;
 /** A client connected to the server has sent data. */
-EAPI extern int ECORE_CON_EVENT_CLIENT_DATA;
+ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_DATA;
 /** A server connection object has data.*/
-EAPI extern int ECORE_CON_EVENT_SERVER_DATA;
+ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_DATA;
 /** A server connection has successfully negotiated an ip:port binding.
 * @since 1.2
 */
-EAPI extern int ECORE_CON_EVENT_PROXY_BIND;
+ECORE_CON_API extern int ECORE_CON_EVENT_PROXY_BIND;
 /** A URL object has data. */
-EAPI extern int ECORE_CON_EVENT_URL_DATA;
+ECORE_CON_API extern int ECORE_CON_EVENT_URL_DATA;
 /** A URL object has completed its transfer to and from the server and can be reused. */
-EAPI extern int ECORE_CON_EVENT_URL_COMPLETE;
+ECORE_CON_API extern int ECORE_CON_EVENT_URL_COMPLETE;
 /** A URL object has made progress in its transfer. */
-EAPI extern int ECORE_CON_EVENT_URL_PROGRESS;
+ECORE_CON_API extern int ECORE_CON_EVENT_URL_PROGRESS;
 /**
 * @}
@@ -698,7 +674,7 @@ EAPI extern int ECORE_CON_EVENT_URL_PROGRESS;
 * @note This function already calls ecore_init() internally, so you don't need
 * to call it explicitly.
 */
-EAPI int               ecore_con_init(void);
+ECORE_CON_API int               ecore_con_init(void);
 /**
 * @brief Shuts down the Ecore_Con library.
@@ -707,7 +683,7 @@ EAPI int               ecore_con_init(void);
 * @note This function already calls ecore_shutdown() internally, so you don't
 * need to call it explicitly unless you called ecore_init() explicitly too.
 */
-EAPI int               ecore_con_shutdown(void);
+ECORE_CON_API int               ecore_con_shutdown(void);
 /**
 * @brief Do an asynchronous DNS lookup.
@@ -727,7 +703,7 @@ EAPI int               ecore_con_shutdown(void);
 * @return @c true if the request did not fail to be set up, @c false
 * otherwise.
 */
-EAPI Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) EINA_ARG_NONNULL(1);
+ECORE_CON_API Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) EINA_ARG_NONNULL(1);
 /**
 * @}
@@ -748,7 +724,7 @@ EAPI Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, cons
 *         @c 2 if SSL is available and provided by openssl,
 *         @c 0 if it is not available.
 */
-EAPI int               ecore_con_ssl_available_get(void);
+ECORE_CON_API int               ecore_con_ssl_available_get(void);
 /**
 * @brief Adds an SSL certificate for use in ecore_con functions.
@@ -760,7 +736,7 @@ EAPI int               ecore_con_ssl_available_get(void);
 * @param cert The path to the certificate.
 * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE.
 */
-EAPI Eina_Bool         ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, const char *cert);
+ECORE_CON_API Eina_Bool         ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, const char *cert);
 /**
 * @brief Adds an SSL private key for use in ecore_con functions.
@@ -772,7 +748,7 @@ EAPI Eina_Bool         ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, cons
 * @param key_file The path to the key file.
 * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE.
 */
-EAPI Eina_Bool         ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, const char *key_file);
+ECORE_CON_API Eina_Bool         ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, const char *key_file);
 /**
 * @brief Adds an SSL CRL for use in ecore_con functions.
@@ -784,7 +760,7 @@ EAPI Eina_Bool         ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, c
 * @param crl_file The path to the CRL file.
 * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE.
 */
-EAPI Eina_Bool         ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const char *crl_file);
+ECORE_CON_API Eina_Bool         ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const char *crl_file);
 /**
 * @brief Adds an SSL CA file for use in ecore_con functions.
@@ -797,7 +773,7 @@ EAPI Eina_Bool         ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const
 * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE.
 * @note since 1.2, this function can load directories.
 */
-EAPI Eina_Bool         ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, const char *ca_file);
+ECORE_CON_API Eina_Bool         ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, const char *ca_file);
 /**
 * @brief Enables certificate verification on a server object.
@@ -806,7 +782,7 @@ EAPI Eina_Bool         ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, co
 * to enable verification of certificates against loaded certificates.
 * @param svr The server object
 */
-EAPI void              ecore_con_ssl_server_verify(Ecore_Con_Server *svr);
+ECORE_CON_API void              ecore_con_ssl_server_verify(Ecore_Con_Server *svr);
 /**
 * @brief Enables hostname-based certificate verification on a server object.
@@ -818,7 +794,7 @@ EAPI void              ecore_con_ssl_server_verify(Ecore_Con_Server *svr);
 * ecore_con_server_add.
 * @since 1.1
 */
-EAPI void              ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr);
+ECORE_CON_API void              ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr);
 /**
 * @brief Sets the hostname to verify against in certificate verification.
@@ -833,7 +809,7 @@ EAPI void              ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr);
 * @param name The hostname to verify against
 * @since 1.2
 */
-EAPI void              ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *svr, const char *name);
+ECORE_CON_API void              ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *svr, const char *name);
 /**
 * @brief Gets the hostname to verify against in certificate verification.
@@ -845,7 +821,7 @@ EAPI void              ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *sv
 * @return The hostname which will be used
 * @since 1.2
 */
-EAPI const char       *ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *svr);
+ECORE_CON_API const char       *ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *svr);
 /**
 * @brief Upgrades a connection to a specified level of encryption.
@@ -860,7 +836,7 @@ EAPI const char       *ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *sv
 * @warning Setting a wrong value for @p ssl_type WILL mess up your program.
 * @since 1.1
 */
-EAPI Eina_Bool         ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore_Con_Type ssl_type);
+ECORE_CON_API Eina_Bool         ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore_Con_Type ssl_type);
 /**
 * @brief Upgrades a connection to a specified level of encryption.
@@ -874,7 +850,7 @@ EAPI Eina_Bool         ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore
 * @warning Setting a wrong value for @p ssl_type WILL mess up your program.
 * @since 1.1
 */
-EAPI Eina_Bool         ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type ssl_type);
+ECORE_CON_API Eina_Bool         ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type ssl_type);
 /**
 * @}
@@ -898,7 +874,7 @@ EAPI Eina_Bool         ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_
 * @note This object NEVER needs to be explicitly freed.
 * @since 1.2
 */
-EAPI Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, const char *username);
+ECORE_CON_API Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, const char *username);
 /**
 * @brief Finds a SOCKS v4 proxy in the proxy list.
@@ -913,7 +889,7 @@ EAPI Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, cons
 * ecore_con_socks4_remote_add() should be used to return the actual object.
 * @since 1.2
 */
-EAPI Eina_Bool        ecore_con_socks4_remote_exists(const char *ip, int port, const char *username);
+ECORE_CON_API Eina_Bool        ecore_con_socks4_remote_exists(const char *ip, int port, const char *username);
 /**
 * @brief Removes a SOCKS v4 proxy from the proxy list and delete it.
@@ -927,7 +903,7 @@ EAPI Eina_Bool        ecore_con_socks4_remote_exists(const char *ip, int port, c
 * @warning Be aware that deleting a proxy which is being used WILL ruin your life.
 * @since 1.2
 */
-EAPI void             ecore_con_socks4_remote_del(const char *ip, int port, const char *username);
+ECORE_CON_API void             ecore_con_socks4_remote_del(const char *ip, int port, const char *username);
 /**
 * @brief Adds a SOCKS v5 proxy to the proxy list.
@@ -942,7 +918,7 @@ EAPI void             ecore_con_socks4_remote_del(const char *ip, int port, cons
 * @note This object NEVER needs to be explicitly freed.
 * @since 1.2
 */
-EAPI Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, const char *username, const char *password);
+ECORE_CON_API Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, const char *username, const char *password);
 /**
 * @brief Finds a SOCKS v5 proxy in the proxy list.
@@ -958,7 +934,7 @@ EAPI Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, cons
 * ecore_con_socks5_remote_add() should be used to return the actual object.
 * @since 1.2
 */
-EAPI Eina_Bool        ecore_con_socks5_remote_exists(const char *ip, int port, const char *username, const char *password);
+ECORE_CON_API Eina_Bool        ecore_con_socks5_remote_exists(const char *ip, int port, const char *username, const char *password);
 /**
 * @brief Removes a SOCKS v5 proxy from the proxy list and delete it.
@@ -973,7 +949,7 @@ EAPI Eina_Bool        ecore_con_socks5_remote_exists(const char *ip, int port, c
 * @warning Be aware that deleting a proxy which is being used WILL ruin your life.
 * @since 1.2
 */
-EAPI void             ecore_con_socks5_remote_del(const char *ip, int port, const char *username, const char *password);
+ECORE_CON_API void             ecore_con_socks5_remote_del(const char *ip, int port, const char *username, const char *password);
 /**
 * @brief Sets DNS lookup mode on an existing SOCKS proxy.
@@ -988,7 +964,7 @@ EAPI void             ecore_con_socks5_remote_del(const char *ip, int port, cons
 * @note By default, this setting is DISABLED.
 * @since 1.2
 */
-EAPI void             ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool enable);
+ECORE_CON_API void             ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool enable);
 /**
 * @brief Gets DNS lookup mode on an existing SOCKS proxy.
@@ -1002,7 +978,7 @@ EAPI void             ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool
 * @note By default, this setting is DISABLED.
 * @since 1.2
 */
-EAPI Eina_Bool        ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs);
+ECORE_CON_API Eina_Bool        ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs);
 /**
 * @brief Enables bind mode on a SOCKS proxy.
@@ -1014,7 +990,7 @@ EAPI Eina_Bool        ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs);
 * @warning Be aware that changing the operation mode of an active proxy may result in undefined behavior
 * @since 1.2
 */
-EAPI void             ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool is_bind);
+ECORE_CON_API void             ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool is_bind);
 /**
 * @brief Returns bind mode of a SOCKS proxy.
@@ -1025,7 +1001,7 @@ EAPI void             ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool i
 * @return If true, the connection established will be a port binding.
 * @since 1.2
 */
-EAPI Eina_Bool        ecore_con_socks_bind_get(Ecore_Con_Socks *ecs);
+ECORE_CON_API Eina_Bool        ecore_con_socks_bind_get(Ecore_Con_Socks *ecs);
 /**
 * @brief Returns SOCKS version of a SOCKS proxy.
@@ -1035,7 +1011,7 @@ EAPI Eina_Bool        ecore_con_socks_bind_get(Ecore_Con_Socks *ecs);
 * @return @c 0 on error, else @c 4/5
 * @since 1.2
 */
-EAPI unsigned int     ecore_con_socks_version_get(Ecore_Con_Socks *ecs);
+ECORE_CON_API unsigned int     ecore_con_socks_version_get(Ecore_Con_Socks *ecs);
 /**
 * @brief Removes a SOCKS v4 proxy from the proxy list and delete it.
@@ -1045,7 +1021,7 @@ EAPI unsigned int     ecore_con_socks_version_get(Ecore_Con_Socks *ecs);
 * @warning Be aware that deleting a proxy which is being used WILL ruin your life.
 * @since 1.2
 */
-EAPI void             ecore_con_socks_remote_del(Ecore_Con_Socks *ecs);
+ECORE_CON_API void             ecore_con_socks_remote_del(Ecore_Con_Socks *ecs);
 /**
 * @brief Sets a proxy object to be used with the next server created with ecore_con_server_connect().
@@ -1056,7 +1032,7 @@ EAPI void             ecore_con_socks_remote_del(Ecore_Con_Socks *ecs);
 * @see ecore_con_socks_apply_always()
 * @since 1.2
 */
-EAPI void             ecore_con_socks_apply_once(Ecore_Con_Socks *ecs);
+ECORE_CON_API void             ecore_con_socks_apply_once(Ecore_Con_Socks *ecs);
 /**
 * @brief Sets a proxy object to be used with all servers created with ecore_con_server_connect().
@@ -1073,7 +1049,7 @@ EAPI void             ecore_con_socks_apply_once(Ecore_Con_Socks *ecs);
 * port is the port to connect to on the proxy server.
 * lookup is 1 if the proxy should perform all DNS lookups, otherwise 0 or omitted.
 */
-EAPI void             ecore_con_socks_apply_always(Ecore_Con_Socks *ecs);
+ECORE_CON_API void             ecore_con_socks_apply_always(Ecore_Con_Socks *ecs);
 /**
 * @}
@@ -1178,7 +1154,7 @@ EAPI void             ecore_con_socks_apply_always(Ecore_Con_Socks *ecs);
 *
 * @since 1.19
 */
-EAPI char *ecore_con_local_path_new(Eina_Bool is_system, const char *name, int port) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(2);
+ECORE_CON_API char *ecore_con_local_path_new(Eina_Bool is_system, const char *name, int port) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(2);
 /**
 * @brief Creates a server to listen for connections.
@@ -1222,7 +1198,7 @@ EAPI char *ecore_con_local_path_new(Eina_Bool is_system, const char *name, int p
 *       #EFL_NET_SERVER_SIMPLE_CLASS.
 *       See @li @ref efl_net_server_simple_example.c
 */
-EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type,
+ECORE_CON_API Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type,
                                            const char *name, int port,
                                            const void *data);
@@ -1278,7 +1254,7 @@ EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type,
 *       #EFL_NET_DIALER_SIMPLE_CLASS.
 *       See @li @ref efl_net_dialer_simple_example.c
 */
-EAPI Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type,
+ECORE_CON_API Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type,
                                                const char *name, int port,
                                                const void *data);
 /**
@@ -1291,7 +1267,7 @@ EAPI Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type,
 *
 * @see ecore_con_server_add, ecore_con_server_connect
 */
-EAPI void *            ecore_con_server_del(Ecore_Con_Server *svr);
+ECORE_CON_API void *            ecore_con_server_del(Ecore_Con_Server *svr);
 /**
 * @brief Retrieves the name of server.
@@ -1303,7 +1279,7 @@ EAPI void *            ecore_con_server_del(Ecore_Con_Server *svr);
 *
 * @ingroup Efl_Network_Server
 */
-EAPI const char *ecore_con_server_name_get(const Ecore_Con_Server *svr);
+ECORE_CON_API const char *ecore_con_server_name_get(const Ecore_Con_Server *svr);
 /**
 * @brief Retrieves the data associated with the given server.
@@ -1313,7 +1289,7 @@ EAPI const char *ecore_con_server_name_get(const Ecore_Con_Server *svr);
 *
 * @see ecore_con_server_data_set()
 */
-EAPI void *            ecore_con_server_data_get(Ecore_Con_Server *svr);
+ECORE_CON_API void *            ecore_con_server_data_get(Ecore_Con_Server *svr);
 /**
 * @brief Sets the data associated with the given server.
 *
@@ -1323,7 +1299,7 @@ EAPI void *            ecore_con_server_data_get(Ecore_Con_Server *svr);
 *
 * @see ecore_con_server_data_get()
 */
-EAPI void *            ecore_con_server_data_set(Ecore_Con_Server *svr,
+ECORE_CON_API void *            ecore_con_server_data_set(Ecore_Con_Server *svr,
                                                 void *data);
 /**
 * @brief Retrieves whether the given server is currently connected.
@@ -1331,7 +1307,7 @@ EAPI void *            ecore_con_server_data_set(Ecore_Con_Server *svr,
 * @param   svr The given server.
 * @return @c EINA_TRUE if the server is connected, @c EINA_FALSE otherwise.
 */
-EAPI Eina_Bool         ecore_con_server_connected_get(const Ecore_Con_Server *svr);
+ECORE_CON_API Eina_Bool         ecore_con_server_connected_get(const Ecore_Con_Server *svr);
 /**
 * @brief Retrieves the server port in use.
@@ -1341,7 +1317,7 @@ EAPI Eina_Bool         ecore_con_server_connected_get(const Ecore_Con_Server *sv
 *
 * The port where the server is listening for connections.
 */
-EAPI int               ecore_con_server_port_get(const Ecore_Con_Server *svr);
+ECORE_CON_API int               ecore_con_server_port_get(const Ecore_Con_Server *svr);
 /**
 * @brief Checks how long a server has been connected.
 *
@@ -1352,7 +1328,7 @@ EAPI int               ecore_con_server_port_get(const Ecore_Con_Server *svr);
 * This function is used to find out the time that has been elapsed since
 * ecore_con_server_add() succeeded.
 */
-EAPI double            ecore_con_server_uptime_get(const Ecore_Con_Server *svr);
+ECORE_CON_API double            ecore_con_server_uptime_get(const Ecore_Con_Server *svr);
 /**
 * @brief Sends the given data to the given server.
 *
@@ -1370,7 +1346,7 @@ EAPI double            ecore_con_server_uptime_get(const Ecore_Con_Server *svr);
 * @see ecore_con_client_send()
 * @see ecore_con_server_flush()
 */
-EAPI int               ecore_con_server_send(Ecore_Con_Server *svr,
+ECORE_CON_API int               ecore_con_server_send(Ecore_Con_Server *svr,
                                             const void *data,
                                             int size);
 /**
@@ -1396,7 +1372,7 @@ EAPI int               ecore_con_server_send(Ecore_Con_Server *svr,
 * clients have already connected and will not be affected by this call.
 * Only clients subsequently trying to connect will be affected.
 */
-EAPI void              ecore_con_server_client_limit_set(Ecore_Con_Server *svr,
+ECORE_CON_API void              ecore_con_server_client_limit_set(Ecore_Con_Server *svr,
                                                         int client_limit,
                                                         char reject_excess_clients);
@@ -1412,7 +1388,7 @@ EAPI void              ecore_con_server_client_limit_set(Ecore_Con_Server *svr,
 * @return The list of clients on this server.
 *
 */
-EAPI const Eina_List *ecore_con_server_clients_get(const Ecore_Con_Server *svr);
+ECORE_CON_API const Eina_List *ecore_con_server_clients_get(const Ecore_Con_Server *svr);
 /**
 * @brief Gets the IP address of a server that has been connected to.
@@ -1424,7 +1400,7 @@ EAPI const Eina_List *ecore_con_server_clients_get(const Ecore_Con_Server *svr);
 *          deletion for the @p svr object. If no IP is known @c NULL is
 *          returned.
 */
-EAPI const char *      ecore_con_server_ip_get(const Ecore_Con_Server *svr);
+ECORE_CON_API const char *      ecore_con_server_ip_get(const Ecore_Con_Server *svr);
 /**
 * @brief Flushes all pending data to the given server.
 *
@@ -1435,7 +1411,7 @@ EAPI const char *      ecore_con_server_ip_get(const Ecore_Con_Server *svr);
 * @see ecore_con_server_send()
 * @see ecore_con_client_flush()
 */
-EAPI void              ecore_con_server_flush(Ecore_Con_Server *svr);
+ECORE_CON_API void              ecore_con_server_flush(Ecore_Con_Server *svr);
 /**
 * @brief Sets the default time after which an inactive client will be disconnected.
 *
@@ -1454,7 +1430,7 @@ EAPI void              ecore_con_server_flush(Ecore_Con_Server *svr);
 * @see ecore_con_server_timeout_get()
 * @see ecore_con_client_timeout_set()
 */
-EAPI void              ecore_con_server_timeout_set(Ecore_Con_Server *svr, double timeout);
+ECORE_CON_API void              ecore_con_server_timeout_set(Ecore_Con_Server *svr, double timeout);
 /**
 * @brief Gets the default time after which an inactive client will be disconnected.
 *
@@ -1467,7 +1443,7 @@ EAPI void              ecore_con_server_timeout_set(Ecore_Con_Server *svr, doubl
 * @see ecore_con_server_timeout_set()
 * @see ecore_con_client_timeout_get()
 */
-EAPI double            ecore_con_server_timeout_get(const Ecore_Con_Server *svr);
+ECORE_CON_API double            ecore_con_server_timeout_get(const Ecore_Con_Server *svr);
 /**
 * @brief Gets the fd that the server is connected to.
@@ -1481,7 +1457,7 @@ EAPI double            ecore_con_server_timeout_get(const Ecore_Con_Server *svr)
 * @warning Seriously. Don't use this unless you know what you are doing.
 * @since 1.1
 */
-EAPI int               ecore_con_server_fd_get(const Ecore_Con_Server *svr);
+ECORE_CON_API int               ecore_con_server_fd_get(const Ecore_Con_Server *svr);
 /**
 * @brief Gets the fd that the client is connected to.
@@ -1493,7 +1469,7 @@ EAPI int               ecore_con_server_fd_get(const Ecore_Con_Server *svr);
 * It should not be tampered with unless you REALLY know what you are doing.
 * @since 1.1
 */
-EAPI int               ecore_con_client_fd_get(const Ecore_Con_Client *cl);
+ECORE_CON_API int               ecore_con_client_fd_get(const Ecore_Con_Client *cl);
 /**
 * @}
 */
@@ -1535,7 +1511,7 @@ EAPI int               ecore_con_client_fd_get(const Ecore_Con_Client *cl);
 * @see ecore_con_server_send()
 * @see ecore_con_client_flush()
 */
-EAPI int               ecore_con_client_send(Ecore_Con_Client *cl,
+ECORE_CON_API int               ecore_con_client_send(Ecore_Con_Client *cl,
                                             const void *data,
                                             int size);
 /**
@@ -1544,14 +1520,14 @@ EAPI int               ecore_con_client_send(Ecore_Con_Client *cl,
 * @param   cl The given client.
 * @return  Data associated with the client.
 */
-EAPI void *            ecore_con_client_del(Ecore_Con_Client *cl);
+ECORE_CON_API void *            ecore_con_client_del(Ecore_Con_Client *cl);
 /**
 * @brief Sets the data associated with the given client to @p data.
 *
 * @param   cl   The given client.
 * @param   data What to set the data to.
 */
-EAPI void              ecore_con_client_data_set(Ecore_Con_Client *cl,
+ECORE_CON_API void              ecore_con_client_data_set(Ecore_Con_Client *cl,
                                                 const void       *data);
 /**
 * @brief Retrieves the data associated with the given client.
@@ -1559,7 +1535,7 @@ EAPI void              ecore_con_client_data_set(Ecore_Con_Client *cl,
 * @param   cl The given client.
 * @return  The data associated with @p cl.
 */
-EAPI void *            ecore_con_client_data_get(Ecore_Con_Client *cl);
+ECORE_CON_API void *            ecore_con_client_data_get(Ecore_Con_Client *cl);
 /**
 * @brief Gets the IP address of a client that has connected.
@@ -1571,7 +1547,7 @@ EAPI void *            ecore_con_client_data_get(Ecore_Con_Client *cl);
 * The returned string should not be modified, freed or trusted to stay valid
 * after deletion for the @p cl object. If no IP is known @c NULL is returned.
 */
-EAPI const char *      ecore_con_client_ip_get(const Ecore_Con_Client *cl);
+ECORE_CON_API const char *      ecore_con_client_ip_get(const Ecore_Con_Client *cl);
 /**
 * @brief Flushes all pending data to the given client.
 *
@@ -1582,7 +1558,7 @@ EAPI const char *      ecore_con_client_ip_get(const Ecore_Con_Client *cl);
 * @see ecore_con_client_send()
 * @see ecore_con_server_flush()
 */
-EAPI void              ecore_con_client_flush(Ecore_Con_Client *cl);
+ECORE_CON_API void              ecore_con_client_flush(Ecore_Con_Client *cl);
 /**
 * @brief Checks how long a client has been connected.
 *
@@ -1592,7 +1568,7 @@ EAPI void              ecore_con_client_flush(Ecore_Con_Client *cl);
 *
 * This function is used to find out how long a client has been connected for.
 */
-EAPI double            ecore_con_client_uptime_get(const Ecore_Con_Client *cl);
+ECORE_CON_API double            ecore_con_client_uptime_get(const Ecore_Con_Client *cl);
 /**
 * @brief Gets the default time after which the client will be disconnected when
 * inactive.
@@ -1605,7 +1581,7 @@ EAPI double            ecore_con_client_uptime_get(const Ecore_Con_Client *cl);
 *
 * @see ecore_con_client_timeout_set()
 */
-EAPI double            ecore_con_client_timeout_get(const Ecore_Con_Client *cl);
+ECORE_CON_API double            ecore_con_client_timeout_get(const Ecore_Con_Client *cl);
 /**
 * @brief Sets the time after which the client will be disconnected when inactive.
 *
@@ -1625,14 +1601,14 @@ EAPI double            ecore_con_client_timeout_get(const Ecore_Con_Client *cl);
 * @see ecore_con_client_timeout_get()
 * @see ecore_con_server_timeout_set()
 */
-EAPI void              ecore_con_client_timeout_set(Ecore_Con_Client *cl, double timeout);
+ECORE_CON_API void              ecore_con_client_timeout_set(Ecore_Con_Client *cl, double timeout);
 /**
 * @brief Returns whether the client is still connected.
 *
 * @param   cl The given client.
 * @return @c EINA_TRUE if connected, @c EINA_FALSE otherwise.
 */
-EAPI Eina_Bool         ecore_con_client_connected_get(const Ecore_Con_Client *cl);
+ECORE_CON_API Eina_Bool         ecore_con_client_connected_get(const Ecore_Con_Client *cl);
 /**
 * @brief Returns the port that the client has connected to.
 *
@@ -1640,7 +1616,7 @@ EAPI Eina_Bool         ecore_con_client_connected_get(const Ecore_Con_Client *cl
 * @return The port that @p cl has connected to, or @c -1 on error
 * Use this function to return the port on which a given client has connected.
 */
-EAPI int               ecore_con_client_port_get(const Ecore_Con_Client *cl);
+ECORE_CON_API int               ecore_con_client_port_get(const Ecore_Con_Client *cl);
 /**
 * @brief The server the client is connected to.
@@ -1648,7 +1624,7 @@ EAPI int               ecore_con_client_port_get(const Ecore_Con_Client *cl);
 * @param cl The client
 * @return The server the client is connected to.
 */
-EAPI Ecore_Con_Server *ecore_con_client_server_get(const Ecore_Con_Client *cl);
+ECORE_CON_API Ecore_Con_Server *ecore_con_client_server_get(const Ecore_Con_Client *cl);
 /**
 * @}
@@ -1773,7 +1749,7 @@ typedef enum _Ecore_Con_Url_Http_Version
 * @since 1.2
 * @see ecore_con_url_pipeline_get()
 */
-EAPI Eina_Bool         ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version);
+ECORE_CON_API Eina_Bool         ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version);
 /**
 * @brief Initializes the Ecore_Con_Url library.
@@ -1783,7 +1759,7 @@ EAPI Eina_Bool         ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ec
 * @note This function doesn't call ecore_con_init(). You still need to call it
 * explicitly before calling this one.
 */
-EAPI int               ecore_con_url_init(void);
+ECORE_CON_API int               ecore_con_url_init(void);
 /**
 * @brief Shuts down the Ecore_Con_Url library.
@@ -1792,7 +1768,7 @@ EAPI int               ecore_con_url_init(void);
 * @note This function doesn't call ecore_con_shutdown(). You still need to call
 * it explicitly after calling this one.
 */
-EAPI int               ecore_con_url_shutdown(void);
+ECORE_CON_API int               ecore_con_url_shutdown(void);
 /**
 * @brief Enables or disable HTTP 1.1 pipelining.
@@ -1809,14 +1785,14 @@ EAPI int               ecore_con_url_shutdown(void);
 *
 * @see ecore_con_url_pipeline_get()
 */
-EAPI void              ecore_con_url_pipeline_set(Eina_Bool enable);
+ECORE_CON_API void              ecore_con_url_pipeline_set(Eina_Bool enable);
 /**
 * @brief Is HTTP 1.1 pipelining enable ?
 * @return @c EINA_TRUE if it is enable.
 *
 * @see ecore_con_url_pipeline_set()
 */
-EAPI Eina_Bool         ecore_con_url_pipeline_get(void);
+ECORE_CON_API Eina_Bool         ecore_con_url_pipeline_get(void);
 /**
 * @brief Creates and initializes a new Ecore_Con_Url connection object.
@@ -1832,7 +1808,7 @@ EAPI Eina_Bool         ecore_con_url_pipeline_get(void);
 * @see ecore_con_url_custom_new()
 * @see ecore_con_url_url_set()
 */
-EAPI Ecore_Con_Url *   ecore_con_url_new(const char *url);
+ECORE_CON_API Ecore_Con_Url *   ecore_con_url_new(const char *url);
 /**
@@ -1842,7 +1818,7 @@ EAPI Ecore_Con_Url *   ecore_con_url_new(const char *url);
 * @param url the new URL.
 * @return @c EINA_TRUE on success, @c EINA_FALSE on errors.
 */
-EAPI Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con,
+ECORE_CON_API Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con,
                                     const char *url);
 /**
@@ -1851,7 +1827,7 @@ EAPI Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con,
 * @param url_con the Connection object to retrieve URL.
 * @return @c NULL on error, read-only URL string on success.
 */
-EAPI const char *ecore_con_url_url_get(Ecore_Con_Url *url_con);
+ECORE_CON_API const char *ecore_con_url_url_get(Ecore_Con_Url *url_con);
 /**
 * @brief Creates a custom connection object.
@@ -1868,7 +1844,7 @@ EAPI const char *ecore_con_url_url_get(Ecore_Con_Url *url_con);
 * @see ecore_con_url_new()
 * @see ecore_con_url_url_set()
 */
-EAPI Ecore_Con_Url *   ecore_con_url_custom_new(const char *url,
+ECORE_CON_API Ecore_Con_Url *   ecore_con_url_custom_new(const char *url,
                                                const char *custom_request);
 /**
 * @brief Destroys an Ecore_Con_Url connection object.
@@ -1877,7 +1853,7 @@ EAPI Ecore_Con_Url *   ecore_con_url_custom_new(const char *url,
 *
 * @see ecore_con_url_new()
 */
-EAPI void              ecore_con_url_free(Ecore_Con_Url *url_con);
+ECORE_CON_API void              ecore_con_url_free(Ecore_Con_Url *url_con);
 /**
 * @brief Associates data with a connection object.
@@ -1890,7 +1866,7 @@ EAPI void              ecore_con_url_free(Ecore_Con_Url *url_con);
 *
 * @see ecore_con_url_data_get()
 */
-EAPI void              ecore_con_url_data_set(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_data_set(Ecore_Con_Url *url_con,
                                              void *data);
 /**
 * @brief Retrieves data associated with a Ecore_Con_Url connection object.
@@ -1904,7 +1880,7 @@ EAPI void              ecore_con_url_data_set(Ecore_Con_Url *url_con,
 *
 * @see ecore_con_url_data_set()
 */
-EAPI void *            ecore_con_url_data_get(Ecore_Con_Url *url_con);
+ECORE_CON_API void *            ecore_con_url_data_get(Ecore_Con_Url *url_con);
 /**
 * @brief Adds an additional header to the request connection object.
 *
@@ -1922,7 +1898,7 @@ EAPI void *            ecore_con_url_data_get(Ecore_Con_Url *url_con);
 * @see ecore_con_url_post()
 * @see ecore_con_url_additional_headers_clear()
 */
-EAPI void              ecore_con_url_additional_header_add(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_additional_header_add(Ecore_Con_Url *url_con,
                                                           const char *key,
                                                           const char *value);
 /**
@@ -1937,7 +1913,7 @@ EAPI void              ecore_con_url_additional_header_add(Ecore_Con_Url *url_co
 * @see ecore_con_url_get()
 * @see ecore_con_url_post()
 */
-EAPI void              ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_con);
+ECORE_CON_API void              ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_con);
 /**
 * @brief Retrieves headers from last request sent.
 *
@@ -1949,7 +1925,7 @@ EAPI void              ecore_con_url_additional_headers_clear(Ecore_Con_Url *url
 *
 * @return List of response headers. This list must not be modified by the user.
 */
-EAPI const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con);
+ECORE_CON_API const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con);
 /**
 * @brief Sets up a file for receiving response data.
 *
@@ -1964,7 +1940,7 @@ EAPI const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con
 * This call can be used to easily setup a file where the downloaded data will
 * be saved.
 */
-EAPI void              ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd);
+ECORE_CON_API void              ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd);
 /**
 * @brief Retrieves the number of bytes received.
 *
@@ -1978,7 +1954,7 @@ EAPI void              ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd);
 * @see ecore_con_url_get()
 * @see ecore_con_url_post()
 */
-EAPI int               ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con);
+ECORE_CON_API int               ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con);
 /**
 * @brief Sets url_con to use http auth, with given username and password, "safely" or not.
 *
@@ -1993,7 +1969,7 @@ EAPI int               ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con);
 * @attention Require libcurl >= 7.19.1 to work, otherwise will always return
 * @c 0.
 */
-EAPI Eina_Bool         ecore_con_url_httpauth_set(Ecore_Con_Url *url_con,
+ECORE_CON_API Eina_Bool         ecore_con_url_httpauth_set(Ecore_Con_Url *url_con,
                                                  const char *username,
                                                  const char *password,
                                                  Eina_Bool safe);
@@ -2017,7 +1993,7 @@ EAPI Eina_Bool         ecore_con_url_httpauth_set(Ecore_Con_Url *url_con,
 * @see ecore_con_url_time()
 * @see ecore_con_url_post()
 */
-EAPI Eina_Bool         ecore_con_url_get(Ecore_Con_Url *url_con);
+ECORE_CON_API Eina_Bool         ecore_con_url_get(Ecore_Con_Url *url_con);
 /**
 * @brief Sends a HEAD request.
 *
@@ -2037,7 +2013,7 @@ EAPI Eina_Bool         ecore_con_url_get(Ecore_Con_Url *url_con);
 * @see ecore_con_url_post()
 * @since 1.14
 */
-EAPI Eina_Bool         ecore_con_url_head(Ecore_Con_Url *url_con);
+ECORE_CON_API Eina_Bool         ecore_con_url_head(Ecore_Con_Url *url_con);
 /**
 * @brief Sends a post request.
 *
@@ -2066,7 +2042,7 @@ EAPI Eina_Bool         ecore_con_url_head(Ecore_Con_Url *url_con);
 * @see ecore_con_url_time()
 * @see ecore_con_url_get()
 */
-EAPI Eina_Bool         ecore_con_url_post(Ecore_Con_Url *url_con,
+ECORE_CON_API Eina_Bool         ecore_con_url_post(Ecore_Con_Url *url_con,
                                          const void *data, long length,
                                          const char *content_type);
 /**
@@ -2084,7 +2060,7 @@ EAPI Eina_Bool         ecore_con_url_post(Ecore_Con_Url *url_con,
 * @sa ecore_con_url_get()
 * @sa ecore_con_url_post()
 */
-EAPI void              ecore_con_url_time(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_time(Ecore_Con_Url *url_con,
                                          Ecore_Con_Url_Time time_condition,
                                          double timestamp);
@@ -2101,7 +2077,7 @@ EAPI void              ecore_con_url_time(Ecore_Con_Url *url_con,
 * Upload @p filename to an ftp server set in @p url_con using @p user
 * and @p pass to directory @p upload_dir
 */
-EAPI Eina_Bool         ecore_con_url_ftp_upload(Ecore_Con_Url *url_con,
+ECORE_CON_API Eina_Bool         ecore_con_url_ftp_upload(Ecore_Con_Url *url_con,
                                                const char *filename,
                                                const char *user,
                                                const char *pass,
@@ -2116,14 +2092,14 @@ EAPI Eina_Bool         ecore_con_url_ftp_upload(Ecore_Con_Url *url_con,
 * information about its operations, which is useful for
 * debugging. The verbose information will be sent to stderr.
 */
-EAPI void              ecore_con_url_verbose_set(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_verbose_set(Ecore_Con_Url *url_con,
                                                 Eina_Bool verbose);
 /**
 * @brief Enables or disables EPSV extension.
 * @param url_con  The Ecore_Con_Url instance which will be acted upon.
 * @param use_epsv Boolean to enable/disable the EPSV extension.
 */
-EAPI void              ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con,
                                                      Eina_Bool use_epsv);
 /**
@@ -2138,7 +2114,7 @@ EAPI void              ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con,
 * @note Even though this function is called @c ecore_con_url_cookies_init(),
 * there is no symmetrical shutdown operation.
 */
-EAPI void              ecore_con_url_cookies_init(Ecore_Con_Url *url_con);
+ECORE_CON_API void              ecore_con_url_cookies_init(Ecore_Con_Url *url_con);
 /**
 * @brief Controls whether session cookies from previous sessions shall be loaded.
 *
@@ -2159,7 +2135,7 @@ EAPI void              ecore_con_url_cookies_init(Ecore_Con_Url *url_con);
 *
 * @see ecore_con_url_cookies_file_add()
 */
-EAPI void              ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_con,
                                                                    Eina_Bool ignore);
 /**
 * @brief Clears currently loaded cookies.
@@ -2183,7 +2159,7 @@ EAPI void              ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Ur
 * @see ecore_con_url_cookies_session_clear()
 * @see ecore_con_url_cookies_ignore_old_session_set()
 */
-EAPI void              ecore_con_url_cookies_clear(Ecore_Con_Url *url_con);
+ECORE_CON_API void              ecore_con_url_cookies_clear(Ecore_Con_Url *url_con);
 /**
 * @brief Clears currently loaded session cookies.
 *
@@ -2212,7 +2188,7 @@ EAPI void              ecore_con_url_cookies_clear(Ecore_Con_Url *url_con);
 * @see ecore_con_url_cookies_clear()
 * @see ecore_con_url_cookies_ignore_old_session_set()
 */
-EAPI void              ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_con);
+ECORE_CON_API void              ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_con);
 /**
 * @brief Adds a file to the list of files from which to load cookies.
 *
@@ -2239,7 +2215,7 @@ EAPI void              ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_co
 * @see ecore_con_url_cookies_ignore_old_session_set()
 * @see ecore_con_url_cookies_jar_file_set()
 */
-EAPI void              ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con,
                                                      const char * const file_name);
 /**
 * @brief Sets the name of the file to which all current cookies will be written when
@@ -2262,7 +2238,7 @@ EAPI void              ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con,
 *
 * @see ecore_con_url_cookies_jar_write()
 */
-EAPI Eina_Bool         ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con,
+ECORE_CON_API Eina_Bool         ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con,
                                                          const char * const cookiejar_file);
 /**
 * @brief Writes all current cookies to the cookie jar immediately.
@@ -2277,7 +2253,7 @@ EAPI Eina_Bool         ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con
 *
 * @see ecore_con_url_cookies_jar_file_set()
 */
-EAPI void              ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con);
+ECORE_CON_API void              ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con);
 /**
 * Toggle libcurl's verify peer's certificate option.
@@ -2291,7 +2267,7 @@ EAPI void              ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con);
 * @param verify Whether or not libcurl will check peer's certificate.
 * @since 1.1.0
 */
-EAPI void              ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con,
+ECORE_CON_API void              ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con,
                                                         Eina_Bool verify);
 /**
 * Set a custom CA to trust for SSL/TLS connections.
@@ -2311,7 +2287,7 @@ EAPI void              ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con,
 * @return  @c 0 on success. When cURL is used, non-zero return values
 *          are equal to cURL error codes.
 */
-EAPI int               ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con,
+ECORE_CON_API int               ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con,
                                                const char *ca_path);
 /**
@@ -2331,7 +2307,7 @@ EAPI int               ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con,
 * @return @c EINA_TRUE on success, @c EINA_FALSE on error.
 * @since 1.2
 */
-EAPI Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy);
+ECORE_CON_API Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy);
 /**
 * @brief Sets zero terminated username to use for proxy.
@@ -2347,7 +2323,7 @@ EAPI Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy
 *
 * @since 1.2
 */
-EAPI Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username);
+ECORE_CON_API Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username);
 /**
 * @brief Sets zero terminated password to use for proxy.
@@ -2363,7 +2339,7 @@ EAPI Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const ch
 *
 * @since 1.2
 */
-EAPI Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const char *password);
+ECORE_CON_API Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const char *password);
 /**
 * @brief Sets timeout in seconds.
@@ -2380,7 +2356,7 @@ EAPI Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const ch
 *
 * @since 1.2
 */
-EAPI void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout);
+ECORE_CON_API void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout);
 /**
 * @brief Gets the returned HTTP STATUS code.
@@ -2391,7 +2367,7 @@ EAPI void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout);
 *
 * @since 1.2
 */
-EAPI int ecore_con_url_status_code_get(Ecore_Con_Url *url_con);
+ECORE_CON_API int ecore_con_url_status_code_get(Ecore_Con_Url *url_con);
 /**
 * @brief Sets a maximum upload speed.
@@ -2399,7 +2375,7 @@ EAPI int ecore_con_url_status_code_get(Ecore_Con_Url *url_con);
 * @param url_obj Connection object
 * @param max_speed Maximum upload speed, in bytes per second
 */
-EAPI void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_obj, off_t max_speed);
+ECORE_CON_API void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_obj, off_t max_speed);
 /**
 * @brief Sets a maximum download speed.
@@ -2407,7 +2383,7 @@ EAPI void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_obj, off_t max_spe
 * @param url_obj Connection object
 * @param max_speed Maximum download speed, in bytes per second
 */
-EAPI void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_obj, off_t max_speed);
+ECORE_CON_API void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_obj, off_t max_speed);
 /**
 * @}
@@ -2417,7 +2393,4 @@ EAPI void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_obj, off_t max_s
 }
 #endif
-#undef EAPI
-#define EAPI
 #endif
diff --git a/src/lib/ecore_con/Ecore_Con_Eet.h b/src/lib/ecore_con/Ecore_Con_Eet.h
index 4a716752a3..013786062e 100644
--- a/src/lib/ecore_con/Ecore_Con_Eet.h
+++ b/src/lib/ecore_con/Ecore_Con_Eet.h
@@ -5,31 +5,7 @@
 #include <Ecore.h>
 #include <Ecore_Con.h>
-#ifdef EAPI
+#include <ecore_con_api.h>
-# undef EAPI
-#endif
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
 /**
 * @defgroup Ecore_Con_Eet_Group Eet connection functions
@@ -100,7 +76,7 @@ typedef Eina_Bool (*Ecore_Con_Eet_Server_Cb)(void *data, Ecore_Con_Reply *reply,
 *
 * @return A new Ecore_Con_Eet server.
 */
-EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server);
+ECORE_CON_API Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server);
 /**
 * @brief Creates an Ecore_Con_Eet client.
@@ -114,7 +90,7 @@ EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server);
 *
 * @return A new Ecore_Con_Eet client.
 */
-EAPI Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server);
+ECORE_CON_API Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server);
 /**
 * @brief Frees an existing Ecore_Con_Eet object.
@@ -124,7 +100,7 @@ EAPI Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server);
 *                  ecore_con_eet_client_new.
 *
 */
-EAPI void ecore_con_eet_server_free(Ecore_Con_Eet *server);
+ECORE_CON_API void ecore_con_eet_server_free(Ecore_Con_Eet *server);
 /**
 * @brief Registers an @c Eet data descriptor on a Ecore_Con_Eet object.
@@ -135,7 +111,7 @@ EAPI void ecore_con_eet_server_free(Ecore_Con_Eet *server);
 *                  in the Eet stream.
 *
 */
-EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd);
+ECORE_CON_API void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd);
 /**
 * @brief Registers a data callback on a Ecore_Con_Eet object.
@@ -147,7 +123,7 @@ EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_
 * @param data      The data to pass to the callback.
 *
 */
-EAPI void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data);
 /**
 * @brief Removes a data callback on a Ecore_Con_Eet object.
@@ -156,7 +132,7 @@ EAPI void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name,
 * @param name      The name of the Eet stream to remove callback on.
 *
 */
-EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name);
+ECORE_CON_API void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name);
 /**
 * @brief Registers a raw data callback on a Ecore_Con_Eet object.
@@ -168,7 +144,7 @@ EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name);
 * @param data      The data to pass to the callback.
 *
 */
-EAPI void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data);
 /**
 * @brief Removes a raw data callback on a Ecore_Con_Eet object.
@@ -177,7 +153,7 @@ EAPI void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *na
 * @param name      The name of the raw Eet stream to remove callback on.
 *
 */
-EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name);
+ECORE_CON_API void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name);
 /**
 * @brief Registers a client connect callback on a Ecore_Con_Eet object.
@@ -189,7 +165,7 @@ EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *na
 * @param func      The function to call as a callback.
 * @param data      The data to pass to the callback.
 */
-EAPI void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
 /**
 * @brief Removes a client connect callback on a Ecore_Con_Eet object.
@@ -198,7 +174,7 @@ EAPI void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Co
 * @param func      The callback to remove.
 * @param data      The data passed to this function at the callback registration.
 */
-EAPI void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
 /**
 * @brief Registers a client disconnect callback on a Ecore_Con_Eet object.
@@ -210,7 +186,7 @@ EAPI void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Co
 * @param func      The function to call as a callback.
 * @param data      The data to pass to the callback.
 */
-EAPI void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
 /**
 * @brief Removes a client disconnect callback on a Ecore_Con_Eet object.
@@ -219,7 +195,7 @@ EAPI void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore
 * @param func      The callback to remove.
 * @param data      The data passed to this function at the callback registration.
 */
-EAPI void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data);
 /**
 * @brief Registers a server connect callback on a Ecore_Con_Eet object.
@@ -231,7 +207,7 @@ EAPI void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore
 * @param func      The function to call as a callback.
 * @param data      The data to pass to the callback.
 */
-EAPI void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
 /**
 * @brief Removes a server connect callback on a Ecore_Con_Eet object.
@@ -240,7 +216,7 @@ EAPI void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Co
 * @param func      The callback to remove.
 * @param data      The data passed to this function at the callback registration.
 */
-EAPI void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
 /**
 * @brief Registers a server disconnect callback on a Ecore_Con_Eet object.
@@ -252,7 +228,7 @@ EAPI void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Co
 * @param func      The function to call as a callback.
 * @param data      The data to pass to the callback.
 */
-EAPI void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
 /**
 * @brief Removes a server disconnect callback on a Ecore_Con_Eet object.
@@ -261,7 +237,7 @@ EAPI void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore
 * @param func      The callback to remove.
 * @param data      The data passed to this function at the callback registration.
 */
-EAPI void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
+ECORE_CON_API void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data);
 /**
 * @brief Attaches data to an Ecore_Con_Eet object.
@@ -269,7 +245,7 @@ EAPI void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore
 * @param ece       An Ecore_Con_Eet object.
 * @param data      The data to attach to the Ecore_Con_Eet object.
 */
-EAPI void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data);
+ECORE_CON_API void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data);
 /**
 * @brief Gets the data attached to an Ecore_Con_Eet object.
@@ -277,7 +253,7 @@ EAPI void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data);
 * @param ece       An Ecore_Con_Eet object.
 * @return The data attached to the Ecore_Con_Eet object.
 */
-EAPI const void *ecore_con_eet_data_get(Ecore_Con_Eet *ece);
+ECORE_CON_API const void *ecore_con_eet_data_get(Ecore_Con_Eet *ece);
 /**
 * @brief Gets the Ecore_Con_Eet object corresponding to the Ecore_Con_Reply object.
@@ -285,7 +261,7 @@ EAPI const void *ecore_con_eet_data_get(Ecore_Con_Eet *ece);
 * @param reply       An Ecore_Con_Reply object.
 * @return The corresponding Ecore_Con_Eet object.
 */
-EAPI Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply);
+ECORE_CON_API Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply);
 /**
 * @brief Sends some data using a protocol type.
@@ -294,7 +270,7 @@ EAPI Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply);
 * @param protocol_name The protocol type to use.
 * @param value         The data to send.
 */
-EAPI void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, void *value);
+ECORE_CON_API void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, void *value);
 /**
 * @brief Sends some raw data using a protocol type.
@@ -305,7 +281,7 @@ EAPI void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name,
 * @param value         The data to send.
 * @param length        The data length.
 */
-EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length);
+ECORE_CON_API void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length);
 /**
 * @}
@@ -315,7 +291,4 @@ EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_na
 }
 #endif
-#undef EAPI
-#define EAPI
 #endif
diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h
index 7cab05efa3..4c5cab8725 100644
--- a/src/lib/ecore_con/Efl_Net.h
+++ b/src/lib/ecore_con/Efl_Net.h
@@ -13,31 +13,7 @@
 #include <Efl_Core.h>
-#ifdef EAPI
+#include <ecore_con_api.h>
-# undef EAPI
-#endif
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif