diff --git a/src/mux_h1.c b/src/mux_h1.c
index 76fd402..b2e6ece 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -416,11 +416,11 @@
 {
 	struct buffer *buf = NULL;
 
-	if (likely(!MT_LIST_ADDED(&h1c->buf_wait.list)) &&
+	if (likely(!LIST_ADDED(&h1c->buf_wait.list)) &&
 	    unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
 		h1c->buf_wait.target = h1c;
 		h1c->buf_wait.wakeup_cb = h1_buf_available;
-		MT_LIST_ADDQ(&ti->buffer_wq, &h1c->buf_wait.list);
+		LIST_ADDQ(&ti->buffer_wq, &h1c->buf_wait.list);
 	}
 	return buf;
 }
@@ -697,7 +697,7 @@
 	h1c->h1s   = NULL;
 	h1c->task  = NULL;
 
-	MT_LIST_INIT(&h1c->buf_wait.list);
+	LIST_INIT(&h1c->buf_wait.list);
 	h1c->wait_event.tasklet = tasklet_new();
 	if (!h1c->wait_event.tasklet)
 		goto fail;
@@ -785,8 +785,8 @@
 		}
 
 
-		if (MT_LIST_ADDED(&h1c->buf_wait.list))
-			MT_LIST_DEL(&h1c->buf_wait.list);
+		if (LIST_ADDED(&h1c->buf_wait.list))
+			LIST_DEL_INIT(&h1c->buf_wait.list);
 
 		h1_release_buf(h1c, &h1c->ibuf);
 		h1_release_buf(h1c, &h1c->obuf);