diff --git a/include/kvm/e820.h b/include/kvm/e820.h
deleted file mode 100644
index 15f62cc..0000000
--- a/include/kvm/e820.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef KVM_E820_H
-#define KVM_E820_H
-
-#include <linux/types.h>
-#include <kvm/bios.h>
-
-#define SMAP    0x534d4150      /* ASCII "SMAP" */
-
-struct biosregs;
-
-extern bioscall void e820_query_map(struct biosregs *regs);
-
-#endif /* KVM_E820_H */
diff --git a/x86/bios.c b/x86/bios.c
index f05cc02..5ac9e24 100644
--- a/x86/bios.c
+++ b/x86/bios.c
@@ -5,7 +5,6 @@
 #include "kvm/util.h"
 
 #include <string.h>
-#include <asm/e820.h>
 
 #include "bios/bios-rom.h"
 
diff --git a/x86/bios/e820.c b/x86/bios/e820.c
index a9bca29..890f83a 100644
--- a/x86/bios/e820.c
+++ b/x86/bios/e820.c
@@ -4,7 +4,6 @@
 #include "kvm/bios.h"
 
 #include <asm/processor-flags.h>
-#include <asm/e820.h>
 
 static inline void set_fs(u16 seg)
 {
diff --git a/x86/include/kvm/e820.h b/x86/include/kvm/e820.h
new file mode 100644
index 0000000..f2889da
--- /dev/null
+++ b/x86/include/kvm/e820.h
@@ -0,0 +1,29 @@
+#ifndef KVM_E820_H
+#define KVM_E820_H
+
+#include <kvm/bios.h>
+
+#define SMAP    0x534d4150      /* ASCII "SMAP" */
+
+#define E820MAX 128             /* number of entries in E820MAP */
+#define E820_X_MAX E820MAX
+
+#define E820_RAM        1
+#define E820_RESERVED   2
+
+struct e820entry {
+	u64 addr;     /* start of memory segment */
+	u64 size;     /* size of memory segment */
+	u32 type;     /* type of memory segment */
+} __attribute__((packed));
+
+struct e820map {
+	u32 nr_map;
+        struct e820entry map[E820_X_MAX];
+};
+
+struct biosregs;
+
+extern bioscall void e820_query_map(struct biosregs *regs);
+
+#endif /* KVM_E820_H */