diff --git a/src/Makefile.am b/src/Makefile.am
index 5ff8e1dd42..b930b544ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,17 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES =
 BUILT_SOURCES =
 
-EOLIAN_FLAGS = -I$(srcdir)\
-	       -I$(srcdir)/lib/eo \
-	       -I$(srcdir)/lib/ector \
-	       -I$(srcdir)/lib/evas/canvas \
-	       -I$(srcdir)/lib/edje \
-	       -I$(srcdir)/lib/efl/interfaces \
-	       -I$(srcdir)/lib/ecore_audio \
-	       -I$(srcdir)/lib/ecore \
-	       -I$(srcdir)/lib/ecore_con \
-	       -I$(srcdir)/lib/eio
-
 DIST_SUBDIRS =
 SUBDIRS =
 
diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am
index 10b15541fc..870a7723d3 100644
--- a/src/Makefile_Elua_Helper.am
+++ b/src/Makefile_Elua_Helper.am
@@ -20,6 +20,6 @@ am__v_ELUA_0 = @echo "  ELUA    " $@;
 SUFFIXES += .lua
 
 %.eo.lua: %.eo ${_ELUA_GEN_DEP}
-	$(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $<
+	$(AM_V_ELUA)$(ELUA_GEN) -I$(srcdir) -o $@ $<
 
 CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 3246324922..b310bbe479 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -56,9 +56,6 @@ bin_eolian_cxx_eolian_cxx_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
 
 if EFL_ENABLE_TESTS
 
-EOLIAN_FLAGS += \
-  -I$(srcdir)
-
 check_PROGRAMS += tests/eolian_cxx/eolian_cxx_suite
 TESTS += tests/eolian_cxx/eolian_cxx_suite
 
diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am
index 1b06afdc8a..64dd131b4b 100644
--- a/src/Makefile_Eolian_Cxx_Helper.am
+++ b/src/Makefile_Eolian_Cxx_Helper.am
@@ -15,6 +15,6 @@ SUFFIXES += .eo.hh
 %.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
 	$(AM_V_EOLCXX) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $<
+	$(EOLIAN_CXX) -I$(srcdir) -o $@ $<
 
 CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index 34ea60fc3a..e533fd9e31 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -15,21 +15,21 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h
 %.eo.c: %.eo ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) --eo --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
+	$(EOLIAN_GEN) --eo --legacy -I$(srcdir) --gc -o $@ $<
 
 %.eo.h: %.eo ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
+	$(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $<
 
 %.eot.h: %.eot ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
+	$(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $<
 
 %.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
 	$(AM_V_EOL) \
 	$(MKDIR_P) $(dir $@); \
-	$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
+	$(EOLIAN_GEN) --legacy -I$(srcdir) --gh -o $@ $<
 
 CLEANFILES += $(BUILT_SOURCES)