diff --git a/src/arch/i386/firmware/pcbios/bios.c b/src/arch/i386/firmware/pcbios/bios.c
index fcbe7f32..2fc4d877 100644
--- a/src/arch/i386/firmware/pcbios/bios.c
+++ b/src/arch/i386/firmware/pcbios/bios.c
@@ -5,7 +5,6 @@
 
 #include "stdint.h"
 #include "realmode.h"
-#include "compiler.h"
 
 #define BIOS_DATA_SEG 0x0040
 
diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c
index b0bee1ab..f6ea952f 100644
--- a/src/arch/i386/firmware/pcbios/bios_console.c
+++ b/src/arch/i386/firmware/pcbios/bios_console.c
@@ -3,7 +3,6 @@
  * Body of routines taken from old pcbios.S
  */
 
-#include "compiler.h"
 #include "realmode.h"
 #include "console.h"
 
diff --git a/src/arch/i386/include/io.h b/src/arch/i386/include/io.h
index 5b6a6243..f2f67cbd 100644
--- a/src/arch/i386/include/io.h
+++ b/src/arch/i386/include/io.h
@@ -1,7 +1,6 @@
 #ifndef	ETHERBOOT_IO_H
 #define ETHERBOOT_IO_H
 
-#include "compiler.h"
 #include "virtaddr.h"
 
 /* virt_to_bus converts an addresss inside of etherboot [_start, _end]
diff --git a/src/arch/i386/include/realmode.h b/src/arch/i386/include/realmode.h
index d641869f..cd6fcfc7 100644
--- a/src/arch/i386/include/realmode.h
+++ b/src/arch/i386/include/realmode.h
@@ -4,7 +4,6 @@
 #ifndef ASSEMBLY
 
 #include "stdint.h"
-#include "compiler.h"
 #include "registers.h"
 #include "io.h"
 
diff --git a/src/arch/i386/include/registers.h b/src/arch/i386/include/registers.h
index 2e78d418..155fffbd 100644
--- a/src/arch/i386/include/registers.h
+++ b/src/arch/i386/include/registers.h
@@ -2,7 +2,6 @@
 #define REGISTERS_H
 
 #include "stdint.h"
-#include "compiler.h"
 
 /* Basic 16-bit and 32-bit register types */
 typedef union {
diff --git a/src/arch/i386/prefix/dskprefix.S b/src/arch/i386/prefix/dskprefix.S
index 7458e235..62b8f5ff 100644
--- a/src/arch/i386/prefix/dskprefix.S
+++ b/src/arch/i386/prefix/dskprefix.S
@@ -1,5 +1,3 @@
-#include "compiler.h"
-
 /* NOTE: this boot sector contains instructions that need at least an 80186.
  * Yes, as86 has a bug somewhere in the valid instruction set checks.
  *