diff --git a/configure.ac b/configure.ac
index 0df3e01310..5d563d5bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -841,15 +841,9 @@ requirements_pc_eina="${requirements_pc_eina} ${platform_pc}"
 
 # Valgrind
 
-if test "x${want_valgrind}" = "xyes" ; then
-   PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0],
-      [
-       have_valgrind="yes"
-       requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}"
-       requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}"
-      ],
-      [AC_MSG_ERROR([Valgrind >= 2.4.0 is required])])
-else
+EFL_OPTIONAL_DEPEND_PKG([eina], [${want_valgrind}],
+   [VALGRIND], [valgrind >= 2.4.0])
+if test "x${have_valgrind}" = "xno"; then
     AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
 fi
 
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 2e58f0f2eb..d3f5738818 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -160,8 +160,7 @@ einampchainedpool_LTLIBRARIES = chained_pool_module.la
 chained_pool_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD \
-@VALGRIND_CFLAGS@
+-DEFL_EINA_BUILD
 chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
 chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
 chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
@@ -178,8 +177,7 @@ einamponebig_LTLIBRARIES = one_big_module.la
 one_big_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD \
-@VALGRIND_CFLAGS@
+-DEFL_EINA_BUILD
 one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
 one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
 one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
@@ -196,8 +194,7 @@ einamppassthrough_LTLIBRARIES = pass_through_module.la
 pass_through_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD \
-@VALGRIND_CFLAGS@
+-DEFL_EINA_BUILD
 pass_through_module_la_CFLAGS = @EINA_CFLAGS@
 pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
 pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
@@ -215,8 +212,7 @@ lib_eina_libeina_la_CPPFLAGS = \
 @EFL_CFLAGS@ \
 @EFL_COV_CFLAGS@ \
 @EFL_PTHREAD_CFLAGS@ \
-@EINA_CFLAGS@ \
-@VALGRIND_CFLAGS@
+@EINA_CFLAGS@
 
 if HAVE_WINDOWS
 lib_eina_libeina_la_CPPFLAGS += \