6 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/machine/acpimp.c b/arch/x86/machine/acpimp.c
index e88e7650..ef93bc43 100644
--- a/arch/x86/machine/acpimp.c
+++ b/arch/x86/machine/acpimp.c
@@ -24,12 +24,12 @@
 #include <kern/stddef.h>
 #include <kern/stdint.h>
 #include <kern/string.h>
-#include <kern/types.h>
 #include <machine/acpimp.h>
 #include <machine/biosmem.h>
 #include <machine/cpu.h>
 #include <machine/io.h>
 #include <machine/lapic.h>
+#include <machine/types.h>
 #include <vm/vm_kmem.h>
 
 /*
diff --git a/arch/x86/machine/biosmem.c b/arch/x86/machine/biosmem.c
index 539ea3ac..6e6410cf 100644
--- a/arch/x86/machine/biosmem.c
+++ b/arch/x86/machine/biosmem.c
@@ -26,11 +26,11 @@
 #include <kern/stddef.h>
 #include <kern/stdint.h>
 #include <kern/string.h>
-#include <kern/types.h>
 #include <machine/biosmem.h>
 #include <machine/boot.h>
 #include <machine/cpu.h>
 #include <machine/multiboot.h>
+#include <machine/types.h>
 #include <vm/vm_kmem.h>
 #include <vm/vm_page.h>
 
diff --git a/arch/x86/machine/biosmem.h b/arch/x86/machine/biosmem.h
index a8b78e8a..19ec2cda 100644
--- a/arch/x86/machine/biosmem.h
+++ b/arch/x86/machine/biosmem.h
@@ -20,8 +20,8 @@
 
 #include <stdbool.h>
 
-#include <kern/types.h>
 #include <machine/multiboot.h>
+#include <machine/types.h>
 
 /*
  * Address where the address of the Extended BIOS Data Area segment can be
diff --git a/arch/x86/machine/pmap.c b/arch/x86/machine/pmap.c
index 888445b0..ea49856e 100644
--- a/arch/x86/machine/pmap.c
+++ b/arch/x86/machine/pmap.c
@@ -36,13 +36,13 @@
 #include <kern/stddef.h>
 #include <kern/string.h>
 #include <kern/thread.h>
-#include <kern/types.h>
 #include <machine/biosmem.h>
 #include <machine/boot.h>
 #include <machine/cpu.h>
 #include <machine/lapic.h>
 #include <machine/pmap.h>
 #include <machine/trap.h>
+#include <machine/types.h>
 #include <vm/vm_kmem.h>
 #include <vm/vm_page.h>
 #include <vm/vm_prot.h>
diff --git a/arch/x86/machine/pmap.h b/arch/x86/machine/pmap.h
index 772eaf08..1806a6fb 100644
--- a/arch/x86/machine/pmap.h
+++ b/arch/x86/machine/pmap.h
@@ -101,9 +101,9 @@
 #include <kern/mutex.h>
 #include <kern/stdint.h>
 #include <kern/thread.h>
-#include <kern/types.h>
 #include <machine/cpu.h>
 #include <machine/trap.h>
+#include <machine/types.h>
 
 /*
  * Mapping creation flags.
diff --git a/arch/x86/machine/strace.c b/arch/x86/machine/strace.c
index 80849acf..e65efb08 100644
--- a/arch/x86/machine/strace.c
+++ b/arch/x86/machine/strace.c
@@ -21,11 +21,11 @@
 #include <kern/printk.h>
 #include <kern/stddef.h>
 #include <kern/string.h>
-#include <kern/types.h>
 #include <machine/elf.h>
 #include <machine/multiboot.h>
 #include <machine/pmap.h>
 #include <machine/strace.h>
+#include <machine/types.h>
 #include <vm/vm_kmem.h>
 
 #ifdef __LP64__