-XBT_PUBLIC int sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout);
-XBT_PUBLIC int sg_comm_wait_any(sg_comm_t* comms, size_t count);
+XBT_PUBLIC int sg_comm_isinstance(sg_activity_t acti);
+
+XBT_PUBLIC void sg_comm_detach(sg_comm_t comm, void (*clean_function)(void*));
+XBT_PUBLIC int sg_comm_test(sg_comm_t comm);
+XBT_PUBLIC sg_error_t sg_comm_wait(sg_comm_t comm);
+XBT_PUBLIC sg_error_t sg_comm_wait_for(sg_comm_t comm, double timeout);
+XBT_PUBLIC void sg_comm_unref(sg_comm_t comm);
+
+#ifndef DOXYGEN
+XBT_ATTRIB_DEPRECATED_v339("Please use sg_activity_set_t instead") XBT_PUBLIC
+ void sg_comm_wait_all(sg_comm_t* comms, size_t count);
+XBT_ATTRIB_DEPRECATED_v339("Please use sg_activity_set_t instead") XBT_PUBLIC
+ ssize_t sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout);
+XBT_ATTRIB_DEPRECATED_v339("Please use sg_activity_set_t instead") XBT_PUBLIC
+ ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count);
+#endif