diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index df5dc338e0..403bef9925 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -182,8 +182,6 @@ typedef Eo Efl_Class;
 typedef Eo Efl_Object;
 #define _EFL_OBJECT_EO_CLASS_TYPE
 
-#ifdef EFL_BETA_API_SUPPORT
-
 /**
  * @var _efl_class_creation_lock
  * This variable is used for locking purposes in the class_get function
@@ -1009,6 +1007,7 @@ EAPI Eina_Bool efl_object_init(void);
  */
 EAPI Eina_Bool efl_object_shutdown(void);
 
+#ifdef EFL_BETA_API_SUPPORT
 
 /**
  * The virtual allocation domain where an object lives
@@ -1192,8 +1191,7 @@ EAPI Eina_Bool        efl_domain_data_return(Efl_Id_Domain domain);
  */
 EAPI Eina_Bool        efl_compatible(const Eo *obj, const Eo *obj_target);
 
-
-
+#endif
 
 // to fetch internal function and object data at once
 typedef struct _Efl_Object_Op_Call_Data
@@ -2293,7 +2291,6 @@ EAPI Eina_Iterator *eo_objects_iterator_new(void);
  * @}
  */
 
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index a9ac302eee..e9fd4b6afa 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -345,7 +345,7 @@ abstract Efl.Object
          [[Get an iterator on all childrens]]
          return: iterator<Efl.Object> @owned @warn_unused; [[Children iterator]]
       }
-      composite_attach {
+      composite_attach @beta {
            [[Make an object a composite object of another.
 
              The class of comp_obj must be part of the extensions of the class of the parent.
@@ -359,7 +359,7 @@ abstract Efl.Object
            }
            return: bool; [[$true if successful. $false otherwise.]]
       }
-      composite_detach {
+      composite_detach @beta {
            [[Detach a composite object from another object.
 
              This functions also sets the parent of comp_obj to $null.
@@ -371,7 +371,7 @@ abstract Efl.Object
            }
            return: bool; [[$true if successful. $false otherwise.]]
       }
-      composite_part_is {
+      composite_part_is @beta {
            [[Check if an object is part of a composite object.
 
              See @.composite_attach, @.composite_part_is.