diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index c6a9ac6b1f..01c51241d5 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -22,7 +22,7 @@ Parents keep references to their children so in order to delete objects that hav
             Eo* parent; /*@ the new parent */
          }
       }
-      event_global_freeze_count {
+      event_global_freeze_count @class {
          get {
             /*@ return freeze events of object.
 Return event freeze count. */
@@ -57,7 +57,7 @@ Lets event callbacks be called for the object. */
          /*@ freeze events of object.
 Prevents event callbacks from being called for the object. */
       }
-      event_global_freeze {
+      event_global_freeze @class {
          /*@ freeze events of object.
 Prevents event callbacks from being called for the object. */
       }
@@ -105,7 +105,7 @@ Should not be used with #eo_do. Only use it with #eo_do_super. */
             @in const(void)* user_data; /*@ The data to compare */
          }
       }
-      event_global_thaw {
+      event_global_thaw @class {
          /*@ thaw events of object.
 Lets event callbacks be called for the object. */
       }
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index fe9cc5f41d..6bc53ab67f 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -781,13 +781,13 @@ _eo_base_event_freeze_count_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd)
 }
 
 EOLIAN static void
-_eo_base_event_global_freeze(Eo *klass EINA_UNUSED, Eo_Base_Data *pd EINA_UNUSED)
+_eo_base_event_global_freeze(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
 {
    event_freeze_count++;
 }
 
 EOLIAN static void
-_eo_base_event_global_thaw(Eo *klass EINA_UNUSED, Eo_Base_Data *pd EINA_UNUSED)
+_eo_base_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
 {
    if (event_freeze_count > 0)
      {
@@ -800,7 +800,7 @@ _eo_base_event_global_thaw(Eo *klass EINA_UNUSED, Eo_Base_Data *pd EINA_UNUSED)
 }
 
 EOLIAN static int
-_eo_base_event_global_freeze_count_get(Eo *klass EINA_UNUSED, Eo_Base_Data *pd EINA_UNUSED)
+_eo_base_event_global_freeze_count_get(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
 {
    return event_freeze_count;
 }