diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index ff099f5043..f7a8f305e4 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2374,8 +2374,8 @@ GENERATED_JS_BINDINGS += $(generated_evas_js_bindings)
 endif
 
 if HAVE_CXX11
-evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh)
-evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh)
+evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh) $(evas_eolian_legacy_files:%.eo=%.eo.hh)
+evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) $(evas_eolian_legacy_files:%.eo=%.eo.impl.hh)
 endif
 
 EXTRA_DIST2 += \
diff --git a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
index eb06ef1e2c..f90e4f79e5 100644
--- a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
@@ -442,7 +442,12 @@ eina::range_array<T> convert_to_return(Eina_Array const* value, tag<Eina_Array c
 template <typename T>
 eina::iterator<T> convert_to_return(Eina_Iterator* value, tag<Eina_Iterator*, eina::iterator<T>>)
 {
-  return eina::iterator<T>{value};
+  return eina::iterator<T>{ value };
+}
+template <typename T>
+eina::accessor<T> convert_to_return(Eina_Accessor* value, tag<Eina_Accessor*, eina::accessor<T>>)
+{
+  return eina::accessor<T>{ value };
 }
 template <typename T>
 struct is_future : std::false_type {};