diff --git a/src/Makefile.am b/src/Makefile.am
index ff0faaa58a..aa7c5efdb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,6 +76,7 @@ include Makefile_Eldbus_Cxx.am
 include Makefile_Eolian_Cxx.am
 include Makefile_Eet_Cxx.am
 include Makefile_Eo_Cxx.am
+include Makefile_Efl_Cxx.am
 
 include Makefile_Elua.am
 
diff --git a/src/Makefile_Efl_Cxx.am b/src/Makefile_Efl_Cxx.am
new file mode 100644
index 0000000000..30a4f9a9bf
--- /dev/null
+++ b/src/Makefile_Efl_Cxx.am
@@ -0,0 +1,23 @@
+if HAVE_CXX11
+
+### Generated headers
+
+generated_efl_cxx_bindings = \
+                 lib/efl/interfaces/efl_interface_file.eo.hh
+
+lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
+	@echo -e "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
+	@echo -e "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/efl/Efl.hh
+	@for i in $(generated_efl_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done
+	@echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh
+
+generated_efl_cxx_all = \
+	$(generated_efl_cxx_bindings) \
+	lib/efl/Efl.hh
+
+CLEANFILES += $(generated_efl_cxx_all)
+
+installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/
+nodist_installed_eflcxxmainheaders_DATA = $(generated_efl_cxx_all)
+
+endif