diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 011b582a2..7464dd5d6 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -481,24 +481,12 @@ typedef struct z_delete_options_t {
    */
   enum zcu_locality_t allowed_destination;
 } z_delete_options_t;
-/**
- * An entity gloabal id.
- */
-typedef struct ALIGN(4) z_entity_global_id_t {
-  uint8_t _0[20];
-} z_entity_global_id_t;
 /**
  * The replies consolidation strategy to apply on replies to a `z_get()`.
  */
 typedef struct z_query_consolidation_t {
   enum z_consolidation_mode_t mode;
 } z_query_consolidation_t;
-/**
- * An owned Zenoh-allocated source info`.
- */
-typedef struct ALIGN(8) z_owned_source_info_t {
-  uint8_t _0[40];
-} z_owned_source_info_t;
 /**
  * Options passed to the `z_get()` function.
  */
@@ -644,12 +632,6 @@ typedef struct z_query_reply_err_options_t {
    */
   struct z_owned_encoding_t *encoding;
 } z_query_reply_err_options_t;
-/**
- * A loaned source info.
- */
-typedef struct ALIGN(8) z_loaned_source_info_t {
-  uint8_t _0[40];
-} z_loaned_source_info_t;
 /**
  * Options to pass to `z_scout()`.
  */
diff --git a/splitguide.yaml b/splitguide.yaml
index 9d1b664fb..0e9109145 100644
--- a/splitguide.yaml
+++ b/splitguide.yaml
@@ -44,6 +44,9 @@ zenoh_opaque.h:
   - z_loaned_session_t!
   - z_owned_config_t!
   - z_loaned_config_t!
+  - z_owned_source_info_t!
+  - z_loaned_source_info_t!
+  - z_entity_global_id_t!
   - z_id_t!
   - z_timestamp_t!
   - z_owned_publisher_t!