diff --git a/src/core/ebuffer.c b/src/core/ebuffer.c
deleted file mode 100644
index 4401a34b..00000000
--- a/src/core/ebuffer.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Brown <mbrown@fensystems.co.uk>.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/**
- * @file
- *
- * Automatically expanding buffers
- *
- */
-
-#include <errno.h>
-#include <gpxe/buffer.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/ebuffer.h>
-
-/**
- * Expand expandable buffer
- *
- * @v buffer		Buffer descriptor
- * @v new_len		Required new size
- * @ret rc		Return status code
- */
-static int ebuffer_expand ( struct buffer *buffer, size_t new_len ) {
-	size_t actual_len = 1;
-	userptr_t new_addr;
-
-	/* Round new_len up to the nearest power of two, to reduce
-	 * total number of reallocations required.  Don't do this for
-	 * the first expansion; this allows for protocols that do
-	 * actually know the exact length in advance.
-	 */
-	if ( buffer->len ) {
-		while ( actual_len < new_len )
-			actual_len <<= 1;
-	} else {
-		actual_len = new_len;
-	}
-
-	/* Reallocate buffer */
-#warning "urealloc() has issues with length zero"
-	new_addr = urealloc ( buffer->addr, // actual_len );
-			      actual_len ? actual_len : 1 );
-	if ( ! new_addr )
-		return -ENOMEM;
-
-	buffer->addr = new_addr;
-	buffer->len = actual_len;
-	return 0;
-}
-
-/**
- * Allocate expandable buffer
- *
- * @v buffer		Buffer descriptor
- * @v len		Initial length (may be zero)
- * @ret rc		Return status code
- *
- * Allocates space for the buffer and stores it in @c buffer->addr.
- * The space must eventually be freed by calling ufree(buffer->addr).
- */
-int ebuffer_alloc ( struct buffer *buffer, size_t len ) {
-	memset ( buffer, 0, sizeof ( *buffer ) );
-	buffer->expand = ebuffer_expand;
-	return ebuffer_expand ( buffer, len );
-}
diff --git a/src/include/gpxe/ebuffer.h b/src/include/gpxe/ebuffer.h
deleted file mode 100644
index 21217fdb..00000000
--- a/src/include/gpxe/ebuffer.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _GPXE_EBUFFER_H
-#define _GPXE_EBUFFER_H
-
-/**
- * @file
- *
- * Automatically expanding buffers
- *
- */
-
-struct buffer;
-
-extern int ebuffer_alloc ( struct buffer *buffer, size_t len );
-
-#endif /* _GPXE_EBUFFER_H */
diff --git a/src/tests/buffertest.c b/src/tests/buffertest.c
deleted file mode 100644
index 0d95d11a..00000000
--- a/src/tests/buffertest.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <assert.h>
-#include <gpxe/buffer.h>
-
-
-struct buffer_test {
-	struct buffer buffer;
-	const char *source;
-	size_t source_len;
-	char *dest;
-	size_t dest_len;
-};
-
-static int test_fill_buffer ( struct buffer_test *test,
-			      size_t start, size_t end ) {
-	const void *data = ( test->source + start );
-	size_t len = ( end - start );
-
-	assert ( end <= test->source_len );
-	assert ( end <= test->dest_len );
-
-	fill_buffer ( &test->buffer, data, start, len );
-	assert ( memcmp ( ( test->dest + start ), data, len ) == 0 );
-	assert ( test->buffer.free >= end );
-	return 0;
-}
-
-int test_buffer ( void ) {
-	char source[123];
-	char dest[123];
-	struct buffer_test test;
-
-	memset ( &test, 0, sizeof ( test ) );
-	test.source = source;
-	test.source_len = sizeof ( source );
-	test.dest = dest;
-	test.dest_len = sizeof ( dest );
-	test.buffer.addr = virt_to_user ( dest );
-	test.buffer.len = sizeof ( dest );
-
-	test_fill_buffer ( &test,  20,  38 );
-	test_fill_buffer ( &test,  60,  61 );
-	test_fill_buffer ( &test,  38,  42 );
-	test_fill_buffer ( &test,  42,  60 );
-	test_fill_buffer ( &test,  16,  80 );
-	test_fill_buffer ( &test,   0,  16 );
-	test_fill_buffer ( &test,  99, 123 );
-	test_fill_buffer ( &test,  80,  99 );
-
-	assert ( test.buffer.fill == sizeof ( source ) );
-	assert ( test.buffer.free == sizeof ( source ) );
-	assert ( memcmp ( source, dest, sizeof ( source ) ) == 0 );
-
-	return 0;
-}