diff --git a/src/Makefile_Ecore_Audio_Cxx.am b/src/Makefile_Ecore_Audio_Cxx.am
index bf564d2c94..5bd661942e 100644
--- a/src/Makefile_Ecore_Audio_Cxx.am
+++ b/src/Makefile_Ecore_Audio_Cxx.am
@@ -3,14 +3,8 @@ if HAVE_CXX11
 
 ### Generated headers
 
-generated_ecore_audio_cxx_bindings = \
-lib/ecore_audio/ecore_audio.eo.hh \
-lib/ecore_audio/ecore_audio_in.eo.hh \
-lib/ecore_audio/ecore_audio_out.eo.hh \
-lib/ecore_audio/ecore_audio_in_sndfile.eo.hh \
-lib/ecore_audio/ecore_audio_out_sndfile.eo.hh \
-lib/ecore_audio/ecore_audio_out_pulse.eo.hh \
-lib/ecore_audio/ecore_audio_in_tone.eo.hh
+generated_ecore_audio_cxx_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.hh)
+generated_ecore_audio_impl_cxx_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.impl.hh)
 
 lib/ecore_audio/Ecore_Audio.hh: $(generated_ecore_audio_cxx_bindings)
 	@echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_AUDIO_HH\n#define EFL_CXX_ECORE_AUDIO_HH\n" > $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh
@@ -20,13 +14,7 @@ lib/ecore_audio/Ecore_Audio.hh: $(generated_ecore_audio_cxx_bindings)
 
 generated_ecore_audio_cxx_all = \
 	$(generated_ecore_audio_cxx_bindings) \
-	lib/ecore_audio/ecore_audio.eo.impl.hh \
-	lib/ecore_audio/ecore_audio_in.eo.impl.hh \
-	lib/ecore_audio/ecore_audio_out.eo.impl.hh \
-	lib/ecore_audio/ecore_audio_in_sndfile.eo.impl.hh \
-	lib/ecore_audio/ecore_audio_out_sndfile.eo.impl.hh \
-	lib/ecore_audio/ecore_audio_out_pulse.eo.impl.hh \
-	lib/ecore_audio/ecore_audio_in_tone.eo.impl.hh \
+	$(generated_ecore_audio_impl_cxx_bindings) \
 	lib/ecore_audio/Ecore_Audio.hh
 
 CLEANFILES += $(generated_ecore_audio_cxx_all)
diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am
index b29a1c4868..35919e55bb 100644
--- a/src/Makefile_Ecore_Cxx.am
+++ b/src/Makefile_Ecore_Cxx.am
@@ -6,13 +6,8 @@ if HAVE_CXX11
 installed_ecorecxxmainheadersdir = $(includedir)/ecore-cxx-@VMAJ@
 dist_installed_ecorecxxmainheaders_DATA = bindings/ecore_cxx/Ecore.hh
 
-generated_ecore_cxx_bindings = \
-lib/ecore/ecore_poller.eo.hh \
-lib/ecore/ecore_job.eo.hh \
-lib/ecore/ecore_idler.eo.hh \
-lib/ecore/ecore_idle_exiter.eo.hh \
-lib/ecore/ecore_animator.eo.hh \
-lib/ecore/ecore_parent.eo.hh
+generated_ecore_cxx_bindings = $(ecore_eolian_files:%.eo=%.eo.hh)
+generated_ecore_cxx_impl_bindings = $(ecore_eolian_files:%.eo=%.eo.impl.hh)
 
 lib/ecore/Ecore.eo.hh: $(generated_ecore_cxx_bindings)
 	@echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_HH\n#define EFL_CXX_ECORE_HH\n" > $(top_builddir)/src/lib/ecore/Ecore.eo.hh
@@ -22,12 +17,7 @@ lib/ecore/Ecore.eo.hh: $(generated_ecore_cxx_bindings)
 
 generated_ecore_cxx_all = \
 	$(generated_ecore_cxx_bindings) \
-	lib/ecore/ecore_poller.eo.impl.hh \
-	lib/ecore/ecore_job.eo.impl.hh \
-	lib/ecore/ecore_idler.eo.impl.hh \
-	lib/ecore/ecore_idle_exiter.eo.impl.hh \
-	lib/ecore/ecore_animator.eo.impl.hh \
-	lib/ecore/ecore_parent.eo.impl.hh \
+	$(generated_ecore_cxx_impl_bindings) \
 	lib/ecore/Ecore.eo.hh
 
 CLEANFILES += $(generated_ecore_cxx_all)
@@ -46,7 +36,10 @@ tests_ecore_cxx_ecore_cxx_suite_SOURCES = \
 tests/ecore_cxx/ecore_cxx_suite.cc \
 tests/ecore_cxx/ecore_cxx_test_safe_call.cc
 
-tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_builddir)/src/lib/ecore \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
@@ -57,6 +50,7 @@ tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
 
 tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc
 tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/efl/interfaces/ \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am
index 0b308b0499..c7f7a7759e 100644
--- a/src/Makefile_Edje_Cxx.am
+++ b/src/Makefile_Edje_Cxx.am
@@ -2,10 +2,8 @@
 if HAVE_CXX11
 
 ### Generated headers
-
-generated_edje_cxx_bindings = \
-lib/edje/edje_object.eo.hh \
-lib/edje/edje_edit.eo.hh
+generated_edje_cxx_bindings = $(edje_eolian_files:%.eo=%.eo.hh)
+generated_edje_cxx_impl_bindings = $(edje_eolian_files:%.eo=%.eo.impl.hh)
 
 lib/edje/Edje.hh: $(generated_edje_cxx_bindings)
 	@echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh
@@ -15,8 +13,7 @@ lib/edje/Edje.hh: $(generated_edje_cxx_bindings)
 
 generated_edje_cxx_all = \
 	$(generated_edje_cxx_bindings) \
-	lib/edje/edje_object.eo.impl.hh \
-	lib/edje/edje_edit.eo.impl.hh \
+	$(generated_edje_cxx_impl_bindings) \
 	lib/edje/Edje.hh
 
 CLEANFILES += $(generated_edje_cxx_all)
diff --git a/src/Makefile_Efl_Cxx.am b/src/Makefile_Efl_Cxx.am
index c555015729..91e02915e3 100644
--- a/src/Makefile_Efl_Cxx.am
+++ b/src/Makefile_Efl_Cxx.am
@@ -2,21 +2,8 @@ if HAVE_CXX11
 
 ### Generated headers
 
-generated_efl_cxx_bindings = \
-                 lib/efl/interfaces/efl_control.eo.hh \
-                 lib/efl/interfaces/efl_file.eo.hh \
-                 lib/efl/interfaces/efl_image.eo.hh \
-                 lib/efl/interfaces/efl_player.eo.hh \
-                 lib/efl/interfaces/efl_text.eo.hh \
-                 lib/efl/interfaces/efl_text_properties.eo.hh \
-		 lib/efl/interfaces/efl_gfx_base.eo.hh \
-		 lib/efl/interfaces/efl_gfx_stack.eo.hh \
-		 lib/efl/interfaces/efl_gfx_fill.eo.hh \
-		 lib/efl/interfaces/efl_gfx_view.eo.hh \
-	         lib/efl/interfaces/efl_gfx_shape.eo.hh \
-		 lib/efl/interfaces/efl_gfx_gradient_base.eo.hh \
-		 lib/efl/interfaces/efl_gfx_gradient_linear.eo.hh \
-		 lib/efl/interfaces/efl_gfx_gradient_radial.eo.hh
+generated_efl_cxx_bindings = $(efl_eolian_files:%.eo=%.eo.hh)
+generated_efl_cxx_impl_bindings = $(efl_eolian_files:%.eo=%.eo.impl.hh)
 
 lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
 	@echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
@@ -26,12 +13,7 @@ lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
 
 generated_efl_cxx_all = \
 	$(generated_efl_cxx_bindings) \
-	lib/efl/interfaces/efl_control.eo.impl.hh \
-	lib/efl/interfaces/efl_file.eo.impl.hh \
-	lib/efl/interfaces/efl_image.eo.impl.hh \
-	lib/efl/interfaces/efl_player.eo.impl.hh \
-	lib/efl/interfaces/efl_text.eo.impl.hh \
-	lib/efl/interfaces/efl_text_properties.eo.impl.hh \
+	$(generated_efl_cxx_impl_bindings) \
 	lib/efl/Efl.hh
 
 CLEANFILES += $(generated_efl_cxx_all)
diff --git a/src/Makefile_Eio_Cxx.am b/src/Makefile_Eio_Cxx.am
index 3f5237169c..b6aeaa0ebf 100644
--- a/src/Makefile_Eio_Cxx.am
+++ b/src/Makefile_Eio_Cxx.am
@@ -1,8 +1,8 @@
 if HAVE_CXX11
 
 ### Generated headers
-
-generated_eio_cxx_bindings = lib/eio/eio_model.eo.hh
+generated_eio_cxx_bindings = $(EIO_EOS:%.eo=%.eo.hh)
+generated_eio_cxx_impl_bindings = $(EIO_EOS:%.eo=%.eo.impl.hh)
 
 lib/eio/Eio.hh: $(generated_eio_cxx_bindings)
 	@echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh
@@ -12,6 +12,7 @@ lib/eio/Eio.hh: $(generated_eio_cxx_bindings)
 
 generated_eio_cxx_all = \
 	$(generated_eio_cxx_bindings) \
+	$(generated_eio_cxx_impl_bindings) \
 	lib/eio/Eio.hh
 
 CLEANFILES += $(generated_eio_cxx_all)
diff --git a/src/Makefile_Eldbus_Cxx.am b/src/Makefile_Eldbus_Cxx.am
index 6776ba1965..ad17184428 100644
--- a/src/Makefile_Eldbus_Cxx.am
+++ b/src/Makefile_Eldbus_Cxx.am
@@ -37,6 +37,8 @@ tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \
 -I$(top_builddir)/src/bindings/eldbus_cxx \
 -I$(top_srcdir)/src/bindings/eldbus_cxx \
 -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_builddir)/src/lib/ecore \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \
 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
 @ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 77a62e3639..c323c654bc 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -93,8 +93,11 @@ tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-b.$(OBJEXT): tests/eolian_cxx
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-c.$(OBJEXT): tests/eolian_cxx/c.eo.c tests/eolian_cxx/c.eo.h
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-d.$(OBJEXT): tests/eolian_cxx/d.eo.c tests/eolian_cxx/d.eo.h
 
-CLEANFILES += tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.c \
+CLEANFILES += \
+tests/eolian_cxx/callback.eo.hh \
+tests/eolian_cxx/callback.eo.c \
 tests/eolian_cxx/callback.eo.h \
+tests/eolian_cxx/callback.eo.impl.hh \
 tests/eolian_cxx/simple.eo.c \
 tests/eolian_cxx/simple.eo.h \
 tests/eolian_cxx/simple.eo.hh \
@@ -110,6 +113,7 @@ tests/eolian_cxx/d.eo.hh tests/eolian_cxx/d.eo.impl.hh tests/eolian_cxx/d.eo.c t
 
 tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \
 -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
 -I$(top_srcdir)/src/bin/eolian_cxx \
 -I$(top_builddir)/src/tests/eolian_cxx \
 -DTESTS_WD=\"`pwd`\" \
diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am
index abe1aa6a9c..8f7a4d2c1c 100644
--- a/src/Makefile_Evas_Cxx.am
+++ b/src/Makefile_Evas_Cxx.am
@@ -3,45 +3,8 @@ if HAVE_CXX11
 
 ### Generated headers
 
-generated_evas_canvas_cxx_bindings = \
-lib/evas/canvas/evas_line.eo.hh \
-lib/evas/canvas/evas_polygon.eo.hh \
-lib/evas/canvas/evas_rectangle.eo.hh \
-lib/evas/canvas/evas_text.eo.hh \
-lib/evas/canvas/evas_textblock.eo.hh \
-lib/evas/canvas/evas_textgrid.eo.hh \
-lib/evas/canvas/evas_signal_interface.eo.hh \
-lib/evas/canvas/evas_object_smart.eo.hh \
-lib/evas/canvas/evas_smart_clipped.eo.hh \
-lib/evas/canvas/evas_table.eo.hh \
-lib/evas/canvas/evas_common_interface.eo.hh \
-lib/evas/canvas/evas_object.eo.hh \
-lib/evas/canvas/evas_canvas.eo.hh \
-lib/evas/canvas/evas_grid.eo.hh \
-lib/evas/canvas/evas_image.eo.hh \
-lib/evas/canvas/evas_out.eo.hh \
-lib/evas/canvas/evas_draggable_interface.eo.hh \
-lib/evas/canvas/evas_clickable_interface.eo.hh \
-lib/evas/canvas/evas_scrollable_interface.eo.hh \
-lib/evas/canvas/evas_selectable_interface.eo.hh \
-lib/evas/canvas/evas_zoomable_interface.eo.hh \
-lib/evas/canvas/evas_box.eo.hh \
-lib/evas/canvas/evas_3d_camera.eo.hh \
-lib/evas/canvas/evas_3d_light.eo.hh \
-lib/evas/canvas/evas_3d_material.eo.hh \
-lib/evas/canvas/evas_3d_mesh.eo.hh \
-lib/evas/canvas/evas_3d_node.eo.hh \
-lib/evas/canvas/evas_3d_object.eo.hh \
-lib/evas/canvas/evas_3d_scene.eo.hh \
-lib/evas/canvas/evas_3d_texture.eo.hh \
-lib/evas/canvas/evas_vg.eo.hh \
-lib/evas/canvas/efl_vg_base.eo.hh \
-lib/evas/canvas/efl_vg_container.eo.hh \
-lib/evas/canvas/efl_vg_shape.eo.hh \
-lib/evas/canvas/efl_vg_root_node.eo.hh \
-lib/evas/canvas/efl_vg_gradient.eo.hh \
-lib/evas/canvas/efl_vg_gradient_radial.eo.hh \
-lib/evas/canvas/efl_vg_gradient_linear.eo.hh
+generated_evas_canvas_cxx_bindings = $(evas_eolian_files:%.eo=%.eo.hh)
+generated_evas_canvas_cxx_impl_bindings = $(evas_eolian_files:%.eo=%.eo.impl.hh)
 
 lib/evas/Evas.hh: $(generated_evas_canvas_cxx_bindings)
 	@echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh
@@ -50,41 +13,11 @@ lib/evas/Evas.hh: $(generated_evas_canvas_cxx_bindings)
 	@echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh
 
 generated_evas_canvas_cxx_all = \
-$(generated_evas_canvas_cxx_bindings) \
-lib/evas/canvas/evas_line.eo.impl.hh \
-lib/evas/canvas/evas_polygon.eo.impl.hh \
-lib/evas/canvas/evas_rectangle.eo.impl.hh \
-lib/evas/canvas/evas_text.eo.impl.hh \
-lib/evas/canvas/evas_textblock.eo.impl.hh \
-lib/evas/canvas/evas_textgrid.eo.impl.hh \
-lib/evas/canvas/evas_signal_interface.eo.impl.hh \
-lib/evas/canvas/evas_object_smart.eo.impl.hh \
-lib/evas/canvas/evas_smart_clipped.eo.impl.hh \
-lib/evas/canvas/evas_table.eo.impl.hh \
-lib/evas/canvas/evas_common_interface.eo.impl.hh \
-lib/evas/canvas/evas_object.eo.impl.hh \
-lib/evas/canvas/evas_canvas.eo.impl.hh \
-lib/evas/canvas/evas_grid.eo.impl.hh \
-lib/evas/canvas/evas_image.eo.impl.hh \
-lib/evas/canvas/evas_out.eo.impl.hh \
-lib/evas/canvas/evas_draggable_interface.eo.impl.hh \
-lib/evas/canvas/evas_clickable_interface.eo.impl.hh \
-lib/evas/canvas/evas_scrollable_interface.eo.impl.hh \
-lib/evas/canvas/evas_selectable_interface.eo.impl.hh \
-lib/evas/canvas/evas_zoomable_interface.eo.impl.hh \
-lib/evas/canvas/evas_box.eo.impl.hh \
-lib/evas/canvas/evas_3d_camera.eo.impl.hh \
-lib/evas/canvas/evas_3d_light.eo.impl.hh \
-lib/evas/canvas/evas_3d_material.eo.impl.hh \
-lib/evas/canvas/evas_3d_mesh.eo.impl.hh \
-lib/evas/canvas/evas_3d_node.eo.impl.hh \
-lib/evas/canvas/evas_3d_object.eo.impl.hh \
-lib/evas/canvas/evas_3d_scene.eo.impl.hh \
-lib/evas/canvas/evas_3d_texture.eo.impl.hh \
-lib/evas/Evas.hh
+  $(generated_evas_canvas_cxx_bindings) \
+  $(generated_evas_canvas_cxx_impl_bindings) \
+  lib/evas/Evas.hh
 
-CLEANFILES += \
-$(generated_evas_canvas_cxx_all)
+CLEANFILES += $(generated_evas_canvas_cxx_all)
 
 installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
 nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh