diff --git a/src/libei.c b/src/libei.c
index c93f2c4..a6f3922 100644
--- a/src/libei.c
+++ b/src/libei.c
@@ -78,6 +78,7 @@ message_free(struct message *msg)
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct message*, message_free);
+#define _cleanup_message_ _cleanup_(message_freep)
 
 static void
 ei_event_destroy(struct ei_event *event)
@@ -569,7 +570,7 @@ connection_parse_message(const char *data, size_t *len)
 		assert(framelen >= 5);
 	}
 
-	_cleanup_(message_freep) struct message *msg = xalloc(sizeof(*msg));
+	_cleanup_message_ struct message *msg = xalloc(sizeof(*msg));
 
 	Frame *frame = frame__unpack(NULL, framelen, (const unsigned char *)data);
 	if (!frame)