diff --git a/rmw_zenoh_cpp/src/detail/zenoh_router_check.cpp b/rmw_zenoh_cpp/src/detail/zenoh_router_check.cpp
index 361b6f13..d0d5f58b 100644
--- a/rmw_zenoh_cpp/src/detail/zenoh_router_check.cpp
+++ b/rmw_zenoh_cpp/src/detail/zenoh_router_check.cpp
@@ -45,7 +45,7 @@ rmw_ret_t zenoh_router_check(z_session_t session)
   rmw_ret_t ret = RMW_RET_OK;
   // z_owned_closure_zid_t router_callback = z_closure(callback, nullptr /* drop */, &context);
   z_owned_closure_zid_t router_callback;
-  router_callback.context = (void*)&context;
+  router_callback.context = (void *)&context;
   router_callback.call = callback;
   router_callback.drop = nullptr;
 
diff --git a/rmw_zenoh_cpp/src/rmw_init.cpp b/rmw_zenoh_cpp/src/rmw_init.cpp
index 23af9da3..6195d2d5 100644
--- a/rmw_zenoh_cpp/src/rmw_init.cpp
+++ b/rmw_zenoh_cpp/src/rmw_init.cpp
@@ -359,9 +359,9 @@ rmw_init(const rmw_init_options_t * options, rmw_context_t * context)
   //   z_move(callback),
   //   &sub_options);
   auto sub_options = zc_liveliness_subscriber_options_null();
-  // z_owned_closure_sample_t callback = z_closure(graph_sub_data_handler, nullptr, context->impl); 
+  // z_owned_closure_sample_t callback = z_closure(graph_sub_data_handler, nullptr, context->impl);
   z_owned_closure_sample_t callback;
-  callback.context = (void*)context->impl;
+  callback.context = (void *)context->impl;
   callback.call = graph_sub_data_handler;
   callback.drop = nullptr;
 
diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
index 2b60a57b..99391867 100644
--- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp
+++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -1449,7 +1449,7 @@ rmw_create_subscription(
   // with Zenoh; after this, callbacks may come in at any time.
   // z_owned_closure_sample_t callback = z_closure(rmw_zenoh_cpp::sub_data_handler, nullptr, sub_data);
   z_owned_closure_sample_t callback;
-  callback.context = (void*)sub_data;
+  callback.context = (void *)sub_data;
   callback.call = rmw_zenoh_cpp::sub_data_handler;
   callback.drop = nullptr;
   z_owned_keyexpr_t keyexpr = ros_topic_name_to_zenoh_key(
@@ -2501,7 +2501,7 @@ rmw_send_request(
   // z_owned_closure_reply_t zn_closure_reply =
   //   z_closure(rmw_zenoh_cpp::client_data_handler, rmw_zenoh_cpp::client_data_drop, client_data);
   z_owned_closure_reply_t zn_closure_reply;
-  zn_closure_reply.context = (void*)client_data;
+  zn_closure_reply.context = (void *)client_data;
   zn_closure_reply.call = rmw_zenoh_cpp::client_data_handler;
   zn_closure_reply.drop = rmw_zenoh_cpp::client_data_drop;
   z_get(
@@ -2877,7 +2877,7 @@ rmw_create_service(
   //   rmw_zenoh_cpp::service_data_handler, nullptr,
   //   service_data);
   z_owned_closure_query_t callback;
-  callback.context = (void*)service_data;
+  callback.context = (void *)service_data;
   callback.call = rmw_zenoh_cpp::service_data_handler;
   callback.drop = nullptr;
   // Configure the queryable to process complete queries.