diff --git a/src/core/buffer.c b/src/core/buffer.c
index 5c31ff8d..81288ff5 100644
--- a/src/core/buffer.c
+++ b/src/core/buffer.c
@@ -43,7 +43,7 @@
 #include "io.h"
 #include "errno.h"
 #include <assert.h>
-#include "buffer.h"
+#include <gpxe/buffer.h>
 
 /**
  * Initialise a buffer.
diff --git a/src/core/image.c b/src/core/image.c
index d8f96b53..ccf7b95e 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -1,5 +1,5 @@
 #include "dev.h"
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include "load_buffer.h"
 #include "image.h"
 #include <console.h>
diff --git a/src/include/dev.h b/src/include/dev.h
index 77452ad7..c46a366d 100644
--- a/src/include/dev.h
+++ b/src/include/dev.h
@@ -3,7 +3,7 @@
 
 #include "stdint.h"
 #include "string.h"
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include "dhcp.h" /* for dhcp_dev_id */
 #include <gpxe/tables.h>
 #include <assert.h>
diff --git a/src/include/buffer.h b/src/include/gpxe/buffer.h
similarity index 97%
rename from src/include/buffer.h
rename to src/include/gpxe/buffer.h
index ac4c3148..dba10b88 100644
--- a/src/include/buffer.h
+++ b/src/include/gpxe/buffer.h
@@ -1,5 +1,5 @@
-#ifndef BUFFER_H
-#define BUFFER_H
+#ifndef _GPXE_BUFFER_H
+#define _GPXE_BUFFER_H
 
 #include "compiler.h" /* for doxygen */
 #include "stdint.h"
@@ -94,4 +94,4 @@ extern void init_buffer ( struct buffer *buffer );
 extern int fill_buffer ( struct buffer *buffer, const void *data,
 			 off_t offset, size_t len );
 
-#endif /* BUFFER_H */
+#endif /* _GPXE_BUFFER_H */
diff --git a/src/include/load_buffer.h b/src/include/load_buffer.h
index 5aa37410..b13c4e2a 100644
--- a/src/include/load_buffer.h
+++ b/src/include/load_buffer.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_BUFFER_H
 #define LOAD_BUFFER_H
 
-#include "buffer.h"
+#include <gpxe/buffer.h>
 
 /*
  * These functions are architecture-dependent, but the interface must
diff --git a/src/include/proto.h b/src/include/proto.h
index c16229ef..a3861f2b 100644
--- a/src/include/proto.h
+++ b/src/include/proto.h
@@ -2,7 +2,7 @@
 #define PROTO_H
 
 #include <gpxe/tables.h>
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include <gpxe/in.h>
 
 struct protocol {
diff --git a/src/include/tftp.h b/src/include/tftp.h
index ed99035e..bdc63374 100644
--- a/src/include/tftp.h
+++ b/src/include/tftp.h
@@ -4,7 +4,7 @@
 /** @file */
 
 #include <gpxe/in.h>
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include "nic.h"
 #include "ip.h"
 #include "udp.h"