diff --git a/src/arch/i386/image/initrd.c b/src/image/initrd.c
similarity index 98%
rename from src/arch/i386/image/initrd.c
rename to src/image/initrd.c
index d0e0d88a6..f03564a81 100644
--- a/src/arch/i386/image/initrd.c
+++ b/src/image/initrd.c
@@ -28,8 +28,8 @@
  *
  */
 
-#include <initrd.h>
 #include <gpxe/image.h>
+#include <gpxe/initrd.h>
 
 /** Linux initrd image type */
 struct image_type initrd_image_type __image_type ( PROBE_NORMAL ) = {
diff --git a/src/arch/i386/include/initrd.h b/src/include/gpxe/initrd.h
similarity index 68%
rename from src/arch/i386/include/initrd.h
rename to src/include/gpxe/initrd.h
index 196a96528..4533a1245 100644
--- a/src/arch/i386/include/initrd.h
+++ b/src/include/gpxe/initrd.h
@@ -1,5 +1,5 @@
-#ifndef _INITRD_H
-#define _INITRD_H
+#ifndef _GPXE_INITRD_H
+#define _GPXE_INITRD_H
 
 /**
  * @file
@@ -11,4 +11,4 @@
 #include <gpxe/image.h>
 extern struct image_type initrdimage_image_type __image_type ( PROBE_NORMAL );
 
-#endif /* _INITRD_H */
+#endif /* _GPXE_INITRD_H */