diff --git a/include/common/buffer.h b/include/common/buffer.h
index fcb61f3c7..9e1f25fa7 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -117,12 +117,6 @@ static inline char *bi_end(const struct buffer *b)
 	return ret;
 }
 
-/* Returns the end of the output data in a buffer */
-static inline char *bo_end(const struct buffer *b)
-{
-	return b->p;
-}
-
 /* Returns the amount of output data that can contiguously be read at once */
 static inline int bo_contig_data(const struct buffer *b)
 {
diff --git a/src/h1.c b/src/h1.c
index d3a20c2ed..ddc7daf15 100644
--- a/src/h1.c
+++ b/src/h1.c
@@ -1220,7 +1220,7 @@ int h1_measure_trailers(const struct buffer *buf)
 	while (1) {
 		const char *p1 = NULL, *p2 = NULL;
 		const char *start = b_ptr(buf, (int)(count - buf->o));
-		const char *stop  = bo_end(buf);
+		const char *stop  = b_peek(buf, buf->o);
 		const char *ptr   = start;
 		int bytes = 0;
 
diff --git a/src/mux_h2.c b/src/mux_h2.c
index afd33cb06..5a7af54d5 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -2988,7 +2988,7 @@ static int h2s_frt_make_resp_headers(struct h2s *h2s, struct buffer *buf)
 	chunk_reset(&outbuf);
 
 	while (1) {
-		outbuf.str  = bo_end(h2c->mbuf);
+		outbuf.str  = b_tail(h2c->mbuf);
 		outbuf.size = bo_contig_space(h2c->mbuf);
 		outbuf.len = 0;
 
@@ -3146,7 +3146,7 @@ static int h2s_frt_make_resp_data(struct h2s *h2s, struct buffer *buf)
 	chunk_reset(&outbuf);
 
 	while (1) {
-		outbuf.str  = bo_end(h2c->mbuf);
+		outbuf.str  = b_tail(h2c->mbuf);
 		outbuf.size = bo_contig_space(h2c->mbuf);
 		outbuf.len = 0;