diff --git a/src/arch/i386/core/hooks.c b/src/arch/i386/core/hooks.c
deleted file mode 100644
index 313dc618..00000000
--- a/src/arch/i386/core/hooks.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "registers.h"
-#include "main.h"
-#include "hooks.h"
-
-/*
- * This file provides the basic entry points from assembly code.  See
- * README.i386 for a description of the entry code path.
- *
- */
-
-/*
- * arch_main() : call main() and then exit via whatever exit mechanism
- * the prefix requested.
- *
- */
-void arch_main ( struct i386_all_regs *ix86 ) {
-	void (*exit_path) ( struct i386_all_regs *ix86 );
-
-	/* Determine exit path requested by prefix */
-	exit_path = ( typeof ( exit_path ) ) ix86->regs.eax;
-
-	/* Call to main() */
-	ix86->regs.eax = main();
-
-	if ( exit_path ) {
-		/* Prefix requested that we use a particular function
-		 * as the exit path, so we call this function, which
-		 * must not return.
-		 */
-		exit_path ( ix86 );
-	}
-}
diff --git a/src/arch/i386/include/hooks.h b/src/arch/i386/include/hooks.h
deleted file mode 100644
index 3cef262f..00000000
--- a/src/arch/i386/include/hooks.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef HOOKS_H
-#define HOOKS_H
-
-extern void arch_main ( struct i386_all_regs *ix86 );
-
-#endif /* HOOKS_H */
diff --git a/src/arch/i386/include/relocate.h b/src/arch/i386/include/relocate.h
deleted file mode 100644
index d8002185..00000000
--- a/src/arch/i386/include/relocate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef RELOCATE_H
-#define RELOCATE_H
-
-/* relocate() is conceptually impossible with KEEP_IT_REAL */
-#ifndef KEEP_IT_REAL
-
-#include <gpxe/tables.h>
-
-/* An entry in the post-relocation function table */
-struct post_reloc_fn {
-	void ( *post_reloc ) ( void );
-};
-
-/* Use double digits to avoid problems with "10" < "9" on alphabetic sort */
-#define POST_RELOC_LIBRM	00
-
-/* Macro for creating a post-relocation function table entry */
-#define POST_RELOC_FN( order, post_reloc_func )			\
-	struct post_reloc_fn PREFIX_OBJECT(post_reloc_fn__)	\
-	    __table ( post_reloc_fn, order ) = {		\
-		.post_reloc = post_reloc_func,			\
-	};
-
-#endif
-
-#endif /* RELOCATE_H */
diff --git a/src/include/init.h b/src/include/init.h
deleted file mode 100644
index 3708d923..00000000
--- a/src/include/init.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef INIT_H
-#define INIT_H
-
-#include "stddef.h" /* for NULL */
-#include <gpxe/tables.h>
-
-/*
- * In order to avoid having objects dragged in just because main()
- * calls their initialisation function, we allow each object to
- * specify that it has a function that must be called to initialise
- * that object.  The function call_init_fns() will call all the
- * included objects' initialisation functions.
- *
- * Objects that require initialisation should include init.h and
- * register the initialisation function using INIT_FN().
- *
- * Objects may register up to three functions: init, reset and exit.
- * init gets called only once, at the point that Etherboot is
- * initialised (before the call to main()).  reset gets called between
- * each boot attempt.  exit gets called only once, just before the
- * loaded OS starts up (or just before Etherboot exits, if it exits,
- * or when the PXE NBP calls UNDI_SHUTDOWN, if it's a PXE NBP).
- *
- * The syntax is:
- *   INIT_FN ( init_order, init_function, reset_function, exit_function );
- * where init_order is an ordering taken from the list below.  Any
- * function may be left as NULL.
- */
-
-/* An entry in the initialisation function table */
-
-struct init_fn {
-	void ( *init ) ( void );
-	void ( *reset ) ( void );
-	void ( *exit ) ( void );
-};
-
-/* Use double digits to avoid problems with "10" < "9" on alphabetic sort */
-#define	INIT_LIBRM	01
-#define	INIT_CONSOLE	02
-#define	INIT_CPU	03
-#define	INIT_TIMERS	04
-#define	INIT_PCIBIOS	05
-#define	INIT_MEMSIZES	06
-#define	INIT_RELOCATE	07
-#define	INIT_LOADBUF	08
-#define	INIT_PCMCIA	09
-#define	INIT_HEAP	10
-#define	INIT_RPC	11
-
-/* Macro for creating an initialisation function table entry */
-#define INIT_FN( init_order, init_func, reset_func, exit_func )	\
-	struct init_fn PREFIX_OBJECT(init_fn__)			\
-	    __table ( init_fn, init_order ) = {			\
-		.init = init_func,				\
-		.reset = reset_func,				\
-		.exit = exit_func,				\
-	};
-
-/* Function prototypes */
-
-void call_init_fns ( void );
-void call_reset_fns ( void );
-void call_exit_fns ( void );
-
-#endif /* INIT_H */