diff --git a/include/types/applet.h b/include/types/applet.h
index da9f787..89602aa 100644
--- a/include/types/applet.h
+++ b/include/types/applet.h
@@ -26,6 +26,7 @@
 #include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/stream.h>
+#include <common/buffer.h>
 #include <common/chunk.h>
 #include <common/config.h>
 
@@ -58,6 +59,7 @@
 	void (*io_release)(struct appctx *appctx);  /* used within the cli_io_handler when st0 = CLI_ST_CALLBACK,
 	                                               if the command is terminated or the session released */
 	void *private;
+	struct buffer_wait buffer_wait; /* position in the list of objects waiting for a buffer */
 
 	union {
 		struct {
diff --git a/include/types/stream.h b/include/types/stream.h
index 2cc903c..26e8dd5 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -135,7 +135,7 @@
 	struct list list;               /* position in global streams list */
 	struct list by_srv;             /* position in server stream list */
 	struct list back_refs;          /* list of users tracking this stream */
-	struct list buffer_wait;        /* position in the list of streams waiting for a buffer */
+	struct buffer_wait buffer_wait; /* position in the list of objects waiting for a buffer */
 
 	struct {
 		struct stksess *ts;