diff --git a/src/check.c b/src/check.c
index ff4effa..6451dcf 100644
--- a/src/check.c
+++ b/src/check.c
@@ -1015,11 +1015,11 @@
 {
 	struct buffer *buf = NULL;
 
-	if (likely(!MT_LIST_ADDED(&check->buf_wait.list)) &&
+	if (likely(!LIST_ADDED(&check->buf_wait.list)) &&
 	    unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
 		check->buf_wait.target = check;
 		check->buf_wait.wakeup_cb = check_buf_available;
-		MT_LIST_ADDQ(&ti->buffer_wq, &check->buf_wait.list);
+		LIST_ADDQ(&ti->buffer_wq, &check->buf_wait.list);
 	}
 	return buf;
 }
@@ -1042,7 +1042,7 @@
 
 	check->bi = BUF_NULL;
 	check->bo = BUF_NULL;
-	MT_LIST_INIT(&check->buf_wait.list);
+	LIST_INIT(&check->buf_wait.list);
 
 	check->wait_list.tasklet = tasklet_new();
 	if (!check->wait_list.tasklet)
diff --git a/src/dynbuf.c b/src/dynbuf.c
index 395fa8a..a6d1d40 100644
--- a/src/dynbuf.c
+++ b/src/dynbuf.c
@@ -33,7 +33,7 @@
 		return 0;
 
 	for (thr = 0; thr < MAX_THREADS; thr++)
-		MT_LIST_INIT(&ha_thread_info[thr].buffer_wq);
+		LIST_INIT(&ha_thread_info[thr].buffer_wq);
 
 
 	/* The reserved buffer is what we leave behind us. Thus we always need
@@ -99,8 +99,7 @@
 /* see offer_buffer() for details */
 void __offer_buffer(void *from, unsigned int threshold)
 {
-	struct buffer_wait *wait;
-	struct mt_list *elt1, elt2;
+	struct buffer_wait *wait, *wait_back;
 	int avail;
 
 	/* For now, we consider that all objects need 1 buffer, so we can stop
@@ -114,14 +113,14 @@
 	 */
 	avail = pool_head_buffer->allocated - pool_head_buffer->used - global.tune.reserved_bufs / 2;
 
-	mt_list_for_each_entry_safe(wait, &ti->buffer_wq, list, elt1, elt2) {
+	list_for_each_entry_safe(wait, wait_back, &ti->buffer_wq, list) {
 		if (avail <= threshold)
 			break;
 
 		if (wait->target == from || !wait->wakeup_cb(wait->target))
 			continue;
 
-		MT_LIST_DEL_SAFE(elt1);
+		LIST_DEL_INIT(&wait->list);
 		avail--;
 	}
 }
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 27a15b6..eee77cb 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -1973,7 +1973,7 @@
 	SPOE_APPCTX(appctx)->buffer          = BUF_NULL;
 	SPOE_APPCTX(appctx)->cur_fpa         = 0;
 
-	MT_LIST_INIT(&SPOE_APPCTX(appctx)->buffer_wait.list);
+	LIST_INIT(&SPOE_APPCTX(appctx)->buffer_wait.list);
 	SPOE_APPCTX(appctx)->buffer_wait.target = appctx;
 	SPOE_APPCTX(appctx)->buffer_wait.wakeup_cb = (int (*)(void *))spoe_wakeup_appctx;
 
@@ -2822,21 +2822,21 @@
 	if (buf->size)
 		return 1;
 
-	if (MT_LIST_ADDED(&buffer_wait->list))
-		MT_LIST_DEL(&buffer_wait->list);
+	if (LIST_ADDED(&buffer_wait->list))
+		LIST_DEL_INIT(&buffer_wait->list);
 
 	if (b_alloc_margin(buf, global.tune.reserved_bufs))
 		return 1;
 
-	MT_LIST_ADDQ(&ti->buffer_wq, &buffer_wait->list);
+	LIST_ADDQ(&ti->buffer_wq, &buffer_wait->list);
 	return 0;
 }
 
 static void
 spoe_release_buffer(struct buffer *buf, struct buffer_wait *buffer_wait)
 {
-	if (MT_LIST_ADDED(&buffer_wait->list))
-		MT_LIST_DEL(&buffer_wait->list);
+	if (LIST_ADDED(&buffer_wait->list))
+		LIST_DEL_INIT(&buffer_wait->list);
 
 	/* Release the buffer if needed */
 	if (buf->size) {
@@ -2870,7 +2870,7 @@
 	ctx->events      = conf->agent->events;
 	ctx->groups      = &conf->agent->groups;
 	ctx->buffer      = BUF_NULL;
-	MT_LIST_INIT(&ctx->buffer_wait.list);
+	LIST_INIT(&ctx->buffer_wait.list);
 	ctx->buffer_wait.target = ctx;
 	ctx->buffer_wait.wakeup_cb = (int (*)(void *))spoe_wakeup_context;
 	LIST_INIT(&ctx->list);
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 2ff7aa9..464a075 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -604,11 +604,11 @@
 {
 	struct buffer *buf = NULL;
 
-	if (likely(!MT_LIST_ADDED(&fconn->buf_wait.list)) &&
+	if (likely(!LIST_ADDED(&fconn->buf_wait.list)) &&
 	    unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
 		fconn->buf_wait.target = fconn;
 		fconn->buf_wait.wakeup_cb = fcgi_buf_available;
-		MT_LIST_ADDQ(&ti->buffer_wq, &fconn->buf_wait.list);
+		LIST_ADDQ(&ti->buffer_wq, &fconn->buf_wait.list);
 	}
 	return buf;
 }
@@ -766,7 +766,7 @@
 	br_init(fconn->mbuf, sizeof(fconn->mbuf) / sizeof(fconn->mbuf[0]));
 	fconn->streams_by_id = EB_ROOT;
 	LIST_INIT(&fconn->send_list);
-	MT_LIST_INIT(&fconn->buf_wait.list);
+	LIST_INIT(&fconn->buf_wait.list);
 
 	conn->ctx = fconn;
 
@@ -845,8 +845,8 @@
 
 		TRACE_DEVEL("freeing fconn", FCGI_EV_FCONN_END, conn);
 
-		if (MT_LIST_ADDED(&fconn->buf_wait.list))
-			MT_LIST_DEL(&fconn->buf_wait.list);
+		if (LIST_ADDED(&fconn->buf_wait.list))
+			LIST_DEL_INIT(&fconn->buf_wait.list);
 
 		fcgi_release_buf(fconn, &fconn->dbuf);
 		fcgi_release_mbuf(fconn);
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 077f4ea..8e17d72 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -448,11 +448,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;
 }
@@ -798,7 +798,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;
@@ -913,8 +913,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);
diff --git a/src/mux_h2.c b/src/mux_h2.c
index cfa5f8c..30bedc3 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -806,11 +806,11 @@
 {
 	struct buffer *buf = NULL;
 
-	if (likely(!MT_LIST_ADDED(&h2c->buf_wait.list)) &&
+	if (likely(!LIST_ADDED(&h2c->buf_wait.list)) &&
 	    unlikely((buf = b_alloc_margin(bptr, 0)) == NULL)) {
 		h2c->buf_wait.target = h2c;
 		h2c->buf_wait.wakeup_cb = h2_buf_available;
-		MT_LIST_ADDQ(&ti->buffer_wq, &h2c->buf_wait.list);
+		LIST_ADDQ(&ti->buffer_wq, &h2c->buf_wait.list);
 	}
 	return buf;
 }
@@ -987,7 +987,7 @@
 	LIST_INIT(&h2c->send_list);
 	LIST_INIT(&h2c->fctl_list);
 	LIST_INIT(&h2c->blocked_list);
-	MT_LIST_INIT(&h2c->buf_wait.list);
+	LIST_INIT(&h2c->buf_wait.list);
 
 	conn->ctx = h2c;
 
@@ -1074,8 +1074,8 @@
 		TRACE_DEVEL("freeing h2c", H2_EV_H2C_END, conn);
 		hpack_dht_free(h2c->ddht);
 
-		if (MT_LIST_ADDED(&h2c->buf_wait.list))
-			MT_LIST_DEL(&h2c->buf_wait.list);
+		if (LIST_ADDED(&h2c->buf_wait.list))
+			LIST_DEL_INIT(&h2c->buf_wait.list);
 
 		h2_release_buf(h2c, &h2c->dbuf);
 		h2_release_mbuf(h2c);
diff --git a/src/stream.c b/src/stream.c
index d747211..29d54c7 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -419,7 +419,7 @@
 	/* OK, we're keeping the stream, so let's properly initialize the stream */
 	LIST_INIT(&s->back_refs);
 
-	MT_LIST_INIT(&s->buffer_wait.list);
+	LIST_INIT(&s->buffer_wait.list);
 	s->buffer_wait.target = s;
 	s->buffer_wait.wakeup_cb = stream_buf_available;
 
@@ -634,8 +634,8 @@
 		put_pipe(s->res.pipe);
 
 	/* We may still be present in the buffer wait queue */
-	if (MT_LIST_ADDED(&s->buffer_wait.list))
-		MT_LIST_DEL(&s->buffer_wait.list);
+	if (LIST_ADDED(&s->buffer_wait.list))
+		LIST_DEL_INIT(&s->buffer_wait.list);
 
 	if (s->req.buf.size || s->res.buf.size) {
 		b_free(&s->req.buf);
@@ -767,13 +767,13 @@
  */
 static int stream_alloc_work_buffer(struct stream *s)
 {
-	if (MT_LIST_ADDED(&s->buffer_wait.list))
-		MT_LIST_DEL(&s->buffer_wait.list);
+	if (LIST_ADDED(&s->buffer_wait.list))
+		LIST_DEL_INIT(&s->buffer_wait.list);
 
 	if (b_alloc_margin(&s->res.buf, 0))
 		return 1;
 
-	MT_LIST_ADDQ(&ti->buffer_wq, &s->buffer_wait.list);
+	LIST_ADDQ(&ti->buffer_wq, &s->buffer_wait.list);
 	return 0;
 }
 
@@ -2885,7 +2885,7 @@
 		chunk_appendf(&trash,
 			     "  flags=0x%x, conn_retries=%d, srv_conn=%p, pend_pos=%p waiting=%d\n",
 			     strm->flags, strm->si[1].conn_retries, strm->srv_conn, strm->pend_pos,
-			     MT_LIST_ADDED(&strm->buffer_wait.list));
+			     LIST_ADDED(&strm->buffer_wait.list));
 
 		chunk_appendf(&trash,
 			     "  frontend=%s (id=%u mode=%s), listener=%s (id=%u)",