diff --git a/legacy/eina/Makefile.am b/legacy/eina/Makefile.am
index 7778fd855e..3e779558e7 100644
--- a/legacy/eina/Makefile.am
+++ b/legacy/eina/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I m4/common -I m4/eina
 
 SUBDIRS = src doc
 
@@ -38,18 +38,18 @@ autogen.sh \
 eina.pc.in \
 eina.spec \
 eina.spec.in \
-m4/efl_attribute.m4 \
-m4/efl_benchmark.m4 \
-m4/efl_compiler_flag.m4 \
-m4/efl_coverage.m4 \
-m4/efl_cpu.m4 \
-m4/efl_doxygen.m4 \
-m4/efl_fnmatch.m4 \
-m4/efl_tests.m4 \
-m4/efl_threads.m4 \
-m4/eina_bench.m4 \
-m4/eina_check.m4 \
-m4/efl_path_max.m4
+m4/common/efl_attribute.m4 \
+m4/common/efl_benchmark.m4 \
+m4/common/efl_compiler_flag.m4 \
+m4/common/efl_coverage.m4 \
+m4/common/efl_cpu.m4 \
+m4/common/efl_doxygen.m4 \
+m4/common/efl_fnmatch.m4 \
+m4/common/efl_tests.m4 \
+m4/common/efl_threads.m4 \
+m4/common/efl_path_max.m4 \
+m4/eina/eina_bench.m4 \
+m4/eina/eina_check.m4
 
 .PHONY: doc coverage benchmark
 
diff --git a/legacy/eina/autogen.sh b/legacy/eina/autogen.sh
index 00116eaf80..25b7c2f398 100755
--- a/legacy/eina/autogen.sh
+++ b/legacy/eina/autogen.sh
@@ -6,7 +6,7 @@ rm -f aclocal.m4 ltmain.sh
 touch README
 touch ABOUT-NLS
 
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 -I m4/common -I m4/eina || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
diff --git a/legacy/eina/m4/efl_attribute.m4 b/legacy/eina/m4/common/efl_attribute.m4
similarity index 100%
rename from legacy/eina/m4/efl_attribute.m4
rename to legacy/eina/m4/common/efl_attribute.m4
diff --git a/legacy/eina/m4/efl_benchmark.m4 b/legacy/eina/m4/common/efl_benchmark.m4
similarity index 100%
rename from legacy/eina/m4/efl_benchmark.m4
rename to legacy/eina/m4/common/efl_benchmark.m4
diff --git a/legacy/eina/m4/efl_compiler_flag.m4 b/legacy/eina/m4/common/efl_compiler_flag.m4
similarity index 100%
rename from legacy/eina/m4/efl_compiler_flag.m4
rename to legacy/eina/m4/common/efl_compiler_flag.m4
diff --git a/legacy/eina/m4/efl_coverage.m4 b/legacy/eina/m4/common/efl_coverage.m4
similarity index 100%
rename from legacy/eina/m4/efl_coverage.m4
rename to legacy/eina/m4/common/efl_coverage.m4
diff --git a/legacy/eina/m4/efl_cpu.m4 b/legacy/eina/m4/common/efl_cpu.m4
similarity index 100%
rename from legacy/eina/m4/efl_cpu.m4
rename to legacy/eina/m4/common/efl_cpu.m4
diff --git a/legacy/eina/m4/efl_doxygen.m4 b/legacy/eina/m4/common/efl_doxygen.m4
similarity index 100%
rename from legacy/eina/m4/efl_doxygen.m4
rename to legacy/eina/m4/common/efl_doxygen.m4
diff --git a/legacy/eina/m4/efl_examples.m4 b/legacy/eina/m4/common/efl_examples.m4
similarity index 100%
rename from legacy/eina/m4/efl_examples.m4
rename to legacy/eina/m4/common/efl_examples.m4
diff --git a/legacy/eina/m4/efl_fnmatch.m4 b/legacy/eina/m4/common/efl_fnmatch.m4
similarity index 100%
rename from legacy/eina/m4/efl_fnmatch.m4
rename to legacy/eina/m4/common/efl_fnmatch.m4
diff --git a/legacy/eina/m4/efl_path_max.m4 b/legacy/eina/m4/common/efl_path_max.m4
similarity index 100%
rename from legacy/eina/m4/efl_path_max.m4
rename to legacy/eina/m4/common/efl_path_max.m4
diff --git a/legacy/eina/m4/efl_tests.m4 b/legacy/eina/m4/common/efl_tests.m4
similarity index 100%
rename from legacy/eina/m4/efl_tests.m4
rename to legacy/eina/m4/common/efl_tests.m4
diff --git a/legacy/eina/m4/efl_threads.m4 b/legacy/eina/m4/common/efl_threads.m4
similarity index 100%
rename from legacy/eina/m4/efl_threads.m4
rename to legacy/eina/m4/common/efl_threads.m4
diff --git a/legacy/eina/m4/efl_voltron.m4 b/legacy/eina/m4/common/efl_voltron.m4
similarity index 100%
rename from legacy/eina/m4/efl_voltron.m4
rename to legacy/eina/m4/common/efl_voltron.m4
diff --git a/legacy/eina/m4/eina_bench.m4 b/legacy/eina/m4/eina/eina_bench.m4
similarity index 100%
rename from legacy/eina/m4/eina_bench.m4
rename to legacy/eina/m4/eina/eina_bench.m4
diff --git a/legacy/eina/m4/eina_check.m4 b/legacy/eina/m4/eina/eina_check.m4
similarity index 100%
rename from legacy/eina/m4/eina_check.m4
rename to legacy/eina/m4/eina/eina_check.m4