diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index b7bce493bd..4e8e4e7ec2 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -45,12 +45,15 @@
 # else
 #  define EAPI __declspec(dllimport)
 # endif /* ! EFL_EINA_BUILD */
+# define EAPI_WEAK
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
 #   define EAPI __attribute__ ((visibility("default")))
+#   define EAPI_WEAK __attribute__ ((weak))
 #  else
 #   define EAPI
+#   define EAPI_WEAK
 #  endif
 # else
 /**
@@ -61,6 +64,9 @@
 # endif
 #endif
 
+/* Weak symbols part of EFL API - Note: not weak on all platforms */
+#define EWAPI EAPI EAPI_WEAK
+
 #ifdef _WIN32
 # ifdef DLL_EXPORT
 #  define EXPORTAPI __declspec(dllexport)
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index fe3cbee2b0..b03b9edf4f 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -12,7 +12,6 @@
 
 /* When used, it indicates that the function is an Eo API. */
 #define EOAPI EAPI EAPI_WEAK
-#define EWAPI EAPI EAPI_WEAK
 
 #ifdef _WIN32
 # ifdef EFL_EO_BUILD
@@ -24,19 +23,15 @@
 # else
 #  define EAPI __declspec(dllimport)
 # endif /* ! EFL_EO_BUILD */
-# define EAPI_WEAK
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
 #   define EAPI __attribute__ ((visibility("default")))
-#   define EAPI_WEAK __attribute__ ((weak))
 #  else
 #   define EAPI
-#   define EAPI_WEAK
 #  endif
 # else
 #  define EAPI
-#  define EAPI_WEAK
 # endif
 #endif /* ! _WIN32 */