diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index 64eda41fbd..bdc5cf0110 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -9,12 +9,11 @@
 #include <Eina.h>
 
 #include <Ecore.h>
-#include <ecore_cocoa_private.h>
 #include <Ecore_Input.h>
 
 #include "Ecore_Cocoa.h"
 #include "Ecore_Cocoa_Keys.h"
-
+#include "ecore_cocoa_private.h"
 
 EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0;
 EAPI int ECORE_COCOA_EVENT_LOST_FOCUS = 0;
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_app.m b/src/lib/ecore_cocoa/ecore_cocoa_app.m
index 5ee349c8aa..d05070a586 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_app.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_app.m
@@ -1,4 +1,6 @@
 #import "ecore_cocoa_app.h"
+#import "ecore_cocoa_window.h"
+#include "ecore_cocoa_private.h"
 
 static Eina_Bool
 _ecore_cocoa_run_loop_cb(void *data EINA_UNUSED)
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_private.h b/src/lib/ecore_cocoa/ecore_cocoa_private.h
index 9127de15c6..ffe48ab074 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_private.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h
@@ -1,7 +1,31 @@
 #ifndef _ECORE_COCOA_PRIVATE_H
 #define _ECORE_COCOA_PRIVATE_H
 
-#include "ecore_cocoa_window.h"
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef _WIN32
+# ifdef EFL_ECORE_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_ECORE_BUILD */
+#else
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else
+#   define EAPI
+#  endif
+# else
+#  define EAPI
+# endif
+#endif /* ! _WIN32 */
 
 extern int _ecore_cocoa_log_domain;
 
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m
index eabc65fdde..2fd4bab189 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_window.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m
@@ -2,11 +2,12 @@
 # include <config.h>
 #endif
 
+#include <Ecore_Input.h>
+
 #include <Ecore.h>
 #include <Ecore_Cocoa.h>
-#include "ecore_cocoa_private.h"
 #import "ecore_cocoa_window.h"
-#include <Ecore_Input.h>
+#include "ecore_cocoa_private.h"
 
 @implementation EcoreCocoaWindow
 
diff --git a/src/lib/ethumb/ethumb_private.h b/src/lib/ethumb/ethumb_private.h
index 49e4de9f67..32e42ac716 100644
--- a/src/lib/ethumb/ethumb_private.h
+++ b/src/lib/ethumb/ethumb_private.h
@@ -4,6 +4,32 @@
 #include <Ethumb.h>
 #include <Ethumb_Plugin.h>
 
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef _WIN32
+# ifdef EFL_ETHUMB_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_ETHUMB_BUILD */
+#else
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else
+#   define EAPI
+#  endif
+# else
+#  define EAPI
+# endif
+#endif /* ! _WIN32 */
+
 typedef struct _Ethumb_Frame Ethumb_Frame;
 
 struct _Ethumb_Frame