diff --git a/rcl/src/rcl/guard_condition.c b/rcl/src/rcl/guard_condition.c
index 05aa636..6f004b5 100644
--- a/rcl/src/rcl/guard_condition.c
+++ b/rcl/src/rcl/guard_condition.c
@@ -36,7 +36,10 @@ typedef struct rcl_guard_condition_impl_t
 rcl_guard_condition_t
 rcl_get_zero_initialized_guard_condition()
 {
-  static rcl_guard_condition_t null_guard_condition = {0};
+  static rcl_guard_condition_t null_guard_condition = {
+    .context = 0,
+    .impl = 0
+  };
   return null_guard_condition;
 }
 
diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
index 5d7fdf0..5b2d46b 100644
--- a/rcl/src/rcl/node.c
+++ b/rcl/src/rcl/node.c
@@ -182,7 +182,10 @@ const char * rcl_get_secure_root(
 rcl_node_t
 rcl_get_zero_initialized_node()
 {
-  static rcl_node_t null_node = {0};
+  static rcl_node_t null_node = {
+    .context = 0,
+    .impl = 0
+  };
   return null_node;
 }