diff --git a/legacy/ethumb/src/plugins/emotion/Makefile.am b/legacy/ethumb/src/plugins/emotion/Makefile.am
index 3c7be5e7ca..495a9a3790 100644
--- a/legacy/ethumb/src/plugins/emotion/Makefile.am
+++ b/legacy/ethumb/src/plugins/emotion/Makefile.am
@@ -11,16 +11,27 @@ files_DATA = emotion_template.edj
 EXTRA_DIST= \
       template.edc
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/emotion \
-	-DPLUGINSDIR=\"$(pluginsdir)\" \
-	@EVAS_CFLAGS@ @EINA_CFLAGS@ @EMOTION_CFLAGS@ @ECORE_FILE_CFLAGS@ \
-	@EDJE_CFLAGS@
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/plugins/emotion \
+-DPLUGINSDIR=\"$(pluginsdir)\" \
+@EFL_ETHUMB_BUILD@ \
+@EVAS_CFLAGS@ \
+@EINA_CFLAGS@ \
+@EMOTION_CFLAGS@ \
+@ECORE_FILE_CFLAGS@ \
+@EDJE_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = emotion.la
 emotion_la_SOURCES = emotion.c
-emotion_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \
-	@EMOTION_LIBS@ @EDJE_LIBS@ @ECORE_FILE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@
+emotion_la_LIBADD = \
+$(top_builddir)/src/lib/libethumb.la \
+@EMOTION_LIBS@ \
+@EDJE_LIBS@ \
+@ECORE_FILE_LIBS@ \
+@EVAS_LIBS@ \
+@EINA_LIBS@
 emotion_la_LDFLAGS = -module -avoid-version
 emotion_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/legacy/ethumb/src/plugins/epdf/Makefile.am b/legacy/ethumb/src/plugins/epdf/Makefile.am
index 5cca82c5f9..497c198870 100644
--- a/legacy/ethumb/src/plugins/epdf/Makefile.am
+++ b/legacy/ethumb/src/plugins/epdf/Makefile.am
@@ -1,13 +1,21 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/epdf \
-	@EINA_CFLAGS@ @EVAS_CFLAGS@ @EPDF_CFLAGS@
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/plugins/epdf \
+@EFL_ETHUMB_BUILD@ \
+@EINA_CFLAGS@ \
+@EVAS_CFLAGS@ \
+@EPDF_CFLAGS@
 
 pluginsdir = $(libdir)/ethumb/plugins
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = epdf.la
 epdf_la_SOURCES = epdf.c
-epdf_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \
-	@EPDF_LIBS@ @EVAS_LIBS@ @EINA_LIBS@
+epdf_la_LIBADD = \
+$(top_builddir)/src/lib/libethumb.la \
+@EPDF_LIBS@ \
+@EVAS_LIBS@ \
+@EINA_LIBS@
 epdf_la_LDFLAGS = -module -avoid-version
 epdf_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/legacy/ethumb/src/plugins/epdf/epdf.c b/legacy/ethumb/src/plugins/epdf/epdf.c
index c3fad4fdb2..82e3b8cf3b 100644
--- a/legacy/ethumb/src/plugins/epdf/epdf.c
+++ b/legacy/ethumb/src/plugins/epdf/epdf.c
@@ -1,16 +1,18 @@
-#include "Ethumb.h"
-#include "Ethumb_Plugin.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <Eina.h>
 #include <Evas.h>
 #include <Epdf.h>
 
+#include "Ethumb.h"
+#include "Ethumb_Plugin.h"
+
+
 static void
 _generate_thumb(Ethumb *e)
 {