diff --git a/examples/z_liveliness.c b/examples/z_liveliness.c
index 3df2f4383..9b9a0965c 100644
--- a/examples/z_liveliness.c
+++ b/examples/z_liveliness.c
@@ -53,7 +53,7 @@ int main(int argc, char **argv) {
 
     printf("Declaring liveliness token '%s'...\n", expr);
     zc_owned_liveliness_token_t token = zc_liveliness_declare_token(z_loan(s), keyexpr, NULL);
-    if (!zc_liveliness_token_check(&token)) {
+    if (!z_check(token)) {
         printf("Unable to create liveliness token!\n");
         exit(-1);
     }
diff --git a/include/zenoh_macros.h b/include/zenoh_macros.h
index d817fb6ad..4bb00e95e 100644
--- a/include/zenoh_macros.h
+++ b/include/zenoh_macros.h
@@ -62,27 +62,29 @@
                   z_owned_reply_channel_t * : z_reply_channel_null,                 \
                   zc_owned_payload_t * : zc_payload_null,                           \
                   zc_owned_shmbuf_t * : zc_shmbuf_null,                             \
-                  zc_owned_shm_manager_t * : zc_shm_manager_null                    \
+                  zc_owned_shm_manager_t * : zc_shm_manager_null,                   \
+                  zc_owned_liveliness_token_t * : zc_liveliness_token_null          \
             )())
 
 #define z_check(x) \
-    _Generic((x), z_owned_session_t : z_session_check,                 \
-                  z_owned_publisher_t : z_publisher_check,             \
-                  z_owned_keyexpr_t : z_keyexpr_check,                 \
-                  z_keyexpr_t : z_keyexpr_is_initialized,              \
-                  z_owned_config_t : z_config_check,                   \
-                  z_owned_scouting_config_t : z_scouting_config_check, \
-                  z_bytes_t : z_bytes_check,                           \
-                  z_owned_subscriber_t : z_subscriber_check,           \
-                  z_owned_pull_subscriber_t : z_pull_subscriber_check, \
-                  z_owned_queryable_t : z_queryable_check,             \
-                  z_owned_encoding_t : z_encoding_check,               \
-                  z_owned_reply_t : z_reply_check,                     \
-                  z_owned_hello_t : z_hello_check,                     \
-                  z_owned_str_t : z_str_check,                         \
-                  zc_owned_payload_t : zc_payload_check,               \
-                  zc_owned_shmbuf_t : zc_shmbuf_check,                 \
-                  zc_owned_shm_manager_t : zc_shm_manager_check        \
+    _Generic((x), z_owned_session_t : z_session_check,                    \
+                  z_owned_publisher_t : z_publisher_check,                \
+                  z_owned_keyexpr_t : z_keyexpr_check,                    \
+                  z_keyexpr_t : z_keyexpr_is_initialized,                 \
+                  z_owned_config_t : z_config_check,                      \
+                  z_owned_scouting_config_t : z_scouting_config_check,    \
+                  z_bytes_t : z_bytes_check,                              \
+                  z_owned_subscriber_t : z_subscriber_check,              \
+                  z_owned_pull_subscriber_t : z_pull_subscriber_check,    \
+                  z_owned_queryable_t : z_queryable_check,                \
+                  z_owned_encoding_t : z_encoding_check,                  \
+                  z_owned_reply_t : z_reply_check,                        \
+                  z_owned_hello_t : z_hello_check,                        \
+                  z_owned_str_t : z_str_check,                            \
+                  zc_owned_payload_t : zc_payload_check,                  \
+                  zc_owned_shmbuf_t : zc_shmbuf_check,                    \
+                  zc_owned_shm_manager_t : zc_shm_manager_check,          \
+                  zc_owned_liveliness_token_t : zc_liveliness_token_check \
             )(&x)
 
 #define z_call(x, ...) \