diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 3601640bb0..b5cb4021ba 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -484,9 +484,12 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
 
    if (need_implementation)
      {
+        Eina_Bool is_cf = eolian_function_is_class(funcid);
+        if (is_cf)
+           eina_strbuf_append(full_params, " EINA_UNUSED");
         eina_strbuf_replace_all(fbody, "@#full_params", eina_strbuf_string_get(full_params));
         const char *data_type = eolian_class_data_type_get(class);
-        if (data_type && !strcmp(data_type, "null"))
+        if (is_cf || (data_type && !strcmp(data_type, "null")))
            eina_strbuf_replace_all(fbody, "@#Datatype_Data", "void");
         else
           {