diff --git a/spa/include/spa/pod/dynamic.h b/spa/include/spa/pod/dynamic.h
index 9fd177159..8cc9914e6 100644
--- a/spa/include/spa/pod/dynamic.h
+++ b/spa/include/spa/pod/dynamic.h
@@ -10,6 +10,7 @@ extern "C" {
 #endif
 
 #include <spa/pod/builder.h>
+#include <spa/utils/cleanup.h>
 
 struct spa_pod_dynamic_builder {
 	struct spa_pod_builder b;
@@ -55,6 +56,10 @@ static inline void spa_pod_dynamic_builder_clean(struct spa_pod_dynamic_builder
 		free(builder->b.data);
 }
 
+SPA_DEFINE_AUTO_CLEANUP(spa_pod_dynamic_builder, struct spa_pod_dynamic_builder, {
+	spa_pod_dynamic_builder_clean(thing);
+})
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif