diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
index d4c39e5dc3..fd44ac0f04 100644
--- a/src/benchmarks/eina/Makefile.am
+++ b/src/benchmarks/eina/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
 -DCITYHASH_BENCH \
 @EINA_CFLAGS@ \
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
index e0f9e4c0f3..737fcc369a 100644
--- a/src/benchmarks/eo/Makefile.am
+++ b/src/benchmarks/eo/Makefile.am
@@ -2,9 +2,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am
index 5ac3ad851d..121f237116 100644
--- a/src/examples/eet/Makefile.am
+++ b/src/examples/eet/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eet \
 @EET_CFLAGS@
 
diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
index 8f67f266cf..97671a4296 100644
--- a/src/examples/eina/Makefile.am
+++ b/src/examples/eina/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina
 
 LDADD = $(top_builddir)/src/lib/eina/libeina.la
 
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index 0580bc0482..f507230e7a 100644
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
diff --git a/src/modules/eina/mp/buddy/Makefile.am b/src/modules/eina/mp/buddy/Makefile.am
index e43db1aa87..4dc40aaf05 100644
--- a/src/modules/eina/mp/buddy/Makefile.am
+++ b/src/modules/eina/mp/buddy/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@
diff --git a/src/modules/eina/mp/chained_pool/Makefile.am b/src/modules/eina/mp/chained_pool/Makefile.am
index 4e93445815..9c701638bd 100644
--- a/src/modules/eina/mp/chained_pool/Makefile.am
+++ b/src/modules/eina/mp/chained_pool/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@ \
diff --git a/src/modules/eina/mp/ememoa_fixed/Makefile.am b/src/modules/eina/mp/ememoa_fixed/Makefile.am
index 50a4115adf..09c12ca36d 100644
--- a/src/modules/eina/mp/ememoa_fixed/Makefile.am
+++ b/src/modules/eina/mp/ememoa_fixed/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EMEMOA_CFLAGS@ \
diff --git a/src/modules/eina/mp/ememoa_unknown/Makefile.am b/src/modules/eina/mp/ememoa_unknown/Makefile.am
index 9713137110..5ab88a687c 100644
--- a/src/modules/eina/mp/ememoa_unknown/Makefile.am
+++ b/src/modules/eina/mp/ememoa_unknown/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EMEMOA_CFLAGS@ \
diff --git a/src/modules/eina/mp/fixed_bitmap/Makefile.am b/src/modules/eina/mp/fixed_bitmap/Makefile.am
index 2143676008..784b740288 100644
--- a/src/modules/eina/mp/fixed_bitmap/Makefile.am
+++ b/src/modules/eina/mp/fixed_bitmap/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@
diff --git a/src/modules/eina/mp/one_big/Makefile.am b/src/modules/eina/mp/one_big/Makefile.am
index 6a5efa531e..3fa4ec92a0 100644
--- a/src/modules/eina/mp/one_big/Makefile.am
+++ b/src/modules/eina/mp/one_big/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@ \
diff --git a/src/modules/eina/mp/pass_through/Makefile.am b/src/modules/eina/mp/pass_through/Makefile.am
index 6d5f1687ee..28ff9e9926 100644
--- a/src/modules/eina/mp/pass_through/Makefile.am
+++ b/src/modules/eina/mp/pass_through/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@
diff --git a/src/tests/eet/Makefile.am b/src/tests/eet/Makefile.am
index 2f72a2a82f..17451ad030 100644
--- a/src/tests/eet/Makefile.am
+++ b/src/tests/eet/Makefile.am
@@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eet \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
 @CHECK_CFLAGS@ \
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
index 72f87d8917..db80e0bb37 100644
--- a/src/tests/eina/Makefile.am
+++ b/src/tests/eina/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@