diff --git a/legacy/ethumb/src/lib/Ethumb.h b/legacy/ethumb/src/lib/Ethumb.h
index a95ed9b6da..8e5ae1477e 100644
--- a/legacy/ethumb/src/lib/Ethumb.h
+++ b/legacy/ethumb/src/lib/Ethumb.h
@@ -10,7 +10,6 @@
 # undef EAPI
 #endif
 
-#ifndef EAPI
 #ifdef _WIN32
 # ifdef EFL_ETHUMB_BUILD
 #  ifdef DLL_EXPORT
@@ -38,7 +37,6 @@
 #  define GNUC_NULL_TERMINATED
 # endif
 #endif /* ! _WIN32 */
-#endif /* EAPI */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c
index a9d2905634..0cfd046411 100644
--- a/legacy/ethumb/src/lib/client/Ethumb_Client.c
+++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c
@@ -63,12 +63,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
-#include <Eina.h>
-#include <eina_safety_checks.h>
-#include <Ethumb.h>
-#include "Ethumb_Client.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
@@ -78,12 +75,17 @@
 #include <sys/types.h>
 #include <stdbool.h>
 
+#include <Eina.h>
+#include <eina_safety_checks.h>
+#include <E_DBus.h>
+#include <Ethumb.h>
+
+#include "Ethumb_Client.h"
+
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
 
-#include <E_DBus.h>
-
 #define MAX_ID 2000000
 
 static int _log_dom = -1;
diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.h b/legacy/ethumb/src/lib/client/Ethumb_Client.h
index fbecbeca70..81d04e1d20 100644
--- a/legacy/ethumb/src/lib/client/Ethumb_Client.h
+++ b/legacy/ethumb/src/lib/client/Ethumb_Client.h
@@ -1,9 +1,14 @@
 #ifndef __ETHUMB_CLIENT_H__
 #define __ETHUMB_CLIENT_H__ 1
 
-#ifndef EAPI
+#include <Ethumb.h>
+
+#ifdef EAPI
+# undef EAPI
+#endif
+
 #ifdef _WIN32
-# ifdef EFL_EVAS_BUILD
+# ifdef EFL_ETHUMB_CLIENT_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #   define GNUC_NULL_TERMINATED
@@ -14,7 +19,7 @@
 # else
 #  define EAPI __declspec(dllimport)
 #  define GNUC_NULL_TERMINATED
-# endif /* ! EFL_EVAS_BUILD */
+# endif /* ! EFL_ETHUMB_BUILD */
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@@ -29,9 +34,6 @@
 #  define GNUC_NULL_TERMINATED
 # endif
 #endif /* ! _WIN32 */
-#endif /* EAPI */
-
-#include <Ethumb.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/legacy/ethumb/src/lib/client/Makefile.am b/legacy/ethumb/src/lib/client/Makefile.am
index 542d347958..e5bbea1932 100644
--- a/legacy/ethumb/src/lib/client/Makefile.am
+++ b/legacy/ethumb/src/lib/client/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/src/lib \
-	@EDBUS_CFLAGS@
+	@EDBUS_CFLAGS@ \
+	@EFL_ETHUMB_CLIENT_BUILD@
 
 include_HEADERS = Ethumb_Client.h
 
@@ -16,6 +17,6 @@ libethumb_client_la_DEPENDENCIES = $(top_builddir)/config.h
 libethumb_client_la_LIBADD = \
 	$(top_builddir)/src/lib/libethumb.la \
 	@EDBUS_LIBS@
-libethumb_client_la_LDFLAGS = -version-info @version_info@
+libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
 
 # @EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@