diff --git a/configure.ac b/configure.ac
index 1532bec9e7..c4cd415106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,14 +396,11 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
 
 # Evil library for compilation on Windows
 
-EFL_EINA_BUILD=""
 case "$host_os" in
    mingw*)
       requirements_pc_eina="${requirements_pc_eina} evil"
-      EFL_EINA_BUILD="-DEFL_EINA_BUILD"
    ;;
 esac
-AC_SUBST([EFL_EINA_BUILD])
 
 # Escape library for compilation on Playstation 3
 
@@ -572,14 +569,11 @@ esac
 
 # Evil library for compilation on Windows
 
-EFL_EET_BUILD=""
 case "$host_os" in
    mingw*)
       requirements_pc_eet="evil ${requirements_pc_eet}"
-      EFL_EET_BUILD="-DEFL_EET_BUILD"
    ;;
 esac
-AC_SUBST(EFL_EET_BUILD)
 
 ## Secure layer
 
@@ -740,14 +734,6 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
 
 ### Checks for compiler characteristics
 
-EFL_EO_BUILD=""
-case "$host_os" in
-   mingw*)
-      EFL_EO_BUILD="-DEFL_EO_BUILD"
-   ;;
-esac
-AC_SUBST([EFL_EO_BUILD])
-
 ### Checks for linker characteristics
 
 ### Checks for library functions
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
index 737fcc369a..052b445f33 100644
--- a/src/benchmarks/eo/Makefile.am
+++ b/src/benchmarks/eo/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eo \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
-@EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
 EXTRA_PROGRAMS = eo_bench
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index 2a2072e451..924138c41e 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eo \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
-@EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
 EXTRA_PROGRAMS = eo_isa eo_simple
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
index 0cd2798441..d3ca72fc36 100644
--- a/src/lib/eet/Makefile.am
+++ b/src/lib/eet/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-@EET_CFLAGS@ \
-@EFL_EET_BUILD@
+-DEFL_EET_BUILD \
+@EET_CFLAGS@
 
 if HAVE_WINDOWS
 AM_CPPFLAGS += \
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index e9c34a35ff..fe8c75dc85 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_EINA_BUILD@ \
+-DEFL_EINA_BUILD \
 @EFL_PTHREAD_CFLAGS@ \
 @EINA_CFLAGS@ \
 @VALGRIND_CFLAGS@
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index b3ca367ef0..02605bcd73 100644
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 -DNDEBUG \
-@EFL_EO_BUILD@ \
+-DEFL_EO_BUILD \
 @EO_CFLAGS@
 
 if HAVE_WINDOWS
diff --git a/src/modules/eina/mp/chained_pool/Makefile.am b/src/modules/eina/mp/chained_pool/Makefile.am
index 42219c5a75..257d51d13f 100644
--- a/src/modules/eina/mp/chained_pool/Makefile.am
+++ b/src/modules/eina/mp/chained_pool/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
-@EFL_EINA_BUILD@ \
+-DEFL_EINA_BUILD \
 @VALGRIND_CFLAGS@
 
 controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
diff --git a/src/modules/eina/mp/one_big/Makefile.am b/src/modules/eina/mp/one_big/Makefile.am
index 881843f91a..24dd4491d3 100644
--- a/src/modules/eina/mp/one_big/Makefile.am
+++ b/src/modules/eina/mp/one_big/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
-@EFL_EINA_BUILD@ \
+-DEFL_EINA_BUILD \
 @VALGRIND_CFLAGS@
 
 controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
diff --git a/src/modules/eina/mp/pass_through/Makefile.am b/src/modules/eina/mp/pass_through/Makefile.am
index 40caf0bf39..56aa9e0e3d 100644
--- a/src/modules/eina/mp/pass_through/Makefile.am
+++ b/src/modules/eina/mp/pass_through/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
-@EFL_EINA_BUILD@
+-DEFL_EINA_BUILD
 
 controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
 controller_LTLIBRARIES = module.la
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
index 91f4178916..d396b9f02e 100644
--- a/src/tests/eina/Makefile.am
+++ b/src/tests/eina/Makefile.am
@@ -62,7 +62,7 @@ check-local: module_dummy.la
 
 module_dummy_la_SOURCES = eina_test_module_dummy.c
 
-module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) @EFL_EINA_BUILD@
+module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) -DEFL_EINA_BUILD
 module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
 module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/tests/eo/Makefile.am b/src/tests/eo/Makefile.am
index b6fab2ef77..b83e7248dc 100644
--- a/src/tests/eo/Makefile.am
+++ b/src/tests/eo/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eo \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
-@EFL_EO_BUILD@ \
 @EO_CFLAGS@ \
 @CHECK_CFLAGS@