diff --git a/spa/include/spa/node/command.h b/spa/include/spa/node/command.h
index bbce4a7fe..571c10499 100644
--- a/spa/include/spa/node/command.h
+++ b/spa/include/spa/node/command.h
@@ -44,10 +44,8 @@ enum spa_node_command {
 };
 
 #define SPA_NODE_COMMAND_ID(cmd)	SPA_COMMAND_ID(cmd, SPA_TYPE_COMMAND_Node)
+#define SPA_NODE_COMMAND_INIT(id)	SPA_COMMAND_INIT(SPA_TYPE_COMMAND_Node, id)
 
-#define SPA_NODE_COMMAND_INIT(id) (struct spa_command)			\
-        { { sizeof(struct spa_command_body), SPA_TYPE_Object },		\
-          { { SPA_TYPE_COMMAND_Node, id } } }				\
 
 #ifdef __cplusplus
 }  /* extern "C" */
diff --git a/spa/include/spa/node/event.h b/spa/include/spa/node/event.h
index cce209f24..ff3513cf9 100644
--- a/spa/include/spa/node/event.h
+++ b/spa/include/spa/node/event.h
@@ -41,10 +41,7 @@ enum spa_node_event {
 };
 
 #define SPA_NODE_EVENT_ID(ev)	SPA_EVENT_ID(ev, SPA_TYPE_EVENT_Node)
-
-#define SPA_NODE_EVENT_INIT(id) (struct spa_event)			\
-        { { sizeof(struct spa_event_body), SPA_TYPE_Object },		\
-          { { SPA_TYPE_EVENT_Node, id } } }				\
+#define SPA_NODE_EVENT_INIT(id) SPA_EVENT_INIT(SPA_TYPE_EVENT_Node, id)
 
 #ifdef __cplusplus
 }  /* extern "C" */
diff --git a/spa/include/spa/pod/command.h b/spa/include/spa/pod/command.h
index b204c3018..1b4458f0e 100644
--- a/spa/include/spa/pod/command.h
+++ b/spa/include/spa/pod/command.h
@@ -45,14 +45,15 @@ struct spa_command {
 #define SPA_COMMAND_ID(cmd,type)	(SPA_COMMAND_TYPE(cmd) == type ? \
 						(cmd)->body.body.id : SPA_ID_INVALID)
 
-#define SPA_COMMAND_INIT(type,id) (struct spa_command)			\
-	{ { sizeof(struct spa_command_body), SPA_TYPE_Object },		\
-	  { { type, id } } }						\
-
 #define SPA_COMMAND_INIT_FULL(t,size,type,id,...) (t)			\
-	{ { size, SPA_TYPE_OBJECT },					\
+	{ { size, SPA_TYPE_Object },					\
 	  { { type, id }, ##__VA_ARGS__ } }				\
 
+#define SPA_COMMAND_INIT(type,id)					\
+	SPA_COMMAND_INIT_FULL(struct spa_command,			\
+			sizeof(struct spa_command_body), type, id)
+
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/spa/include/spa/pod/event.h b/spa/include/spa/pod/event.h
index a932fb23c..6af5b88d2 100644
--- a/spa/include/spa/pod/event.h
+++ b/spa/include/spa/pod/event.h
@@ -44,14 +44,14 @@ struct spa_event {
 #define SPA_EVENT_ID(ev,type)	(SPA_EVENT_TYPE(ev) == type ? \
 					(ev)->body.body.id : SPA_ID_INVALID)
 
-#define SPA_EVENT_INIT(type,id) (struct spa_event)			\
-	{ { sizeof(struct spa_event_body), SPA_TYPE_Object },		\
-	  { { type, id } } }						\
-
 #define SPA_EVENT_INIT_FULL(t,size,type,id,...) (t)			\
 	{ { size, SPA_TYPE_OBJECT },					\
 	  { { type, id }, ##__VA_ARGS__ } }				\
 
+#define SPA_EVENT_INIT(type,id)						\
+	SPA_EVENT_INIT_FULL(struct spa_event,				\
+			sizeof(struct spa_event_body), type, id)
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif