diff --git a/lib/libc/posix/mman.c b/lib/libc/posix/mman.c
index 34159aa..8f51dc7 100644
--- a/lib/libc/posix/mman.c
+++ b/lib/libc/posix/mman.c
@@ -3,12 +3,8 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-#if defined(__x86_64__)
 #include <sys/cdefs.h>
-#include <machine/amd64.h>
-#else
-#error "Unsupported Architecture!"
-#endif
+#include <machine/cpu.h>
 
 #include <syscall.h>
 
diff --git a/sys/amd64/critical.c b/sys/amd64/critical.c
index 95afd72..610f990 100644
--- a/sys/amd64/critical.c
+++ b/sys/amd64/critical.c
@@ -8,8 +8,8 @@
 #include <sys/mp.h>
 #include <sys/spinlock.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 uint32_t lockLevel[MAX_CPUS];
 
diff --git a/sys/amd64/debug.c b/sys/amd64/debug.c
index 5012510..83337b9 100644
--- a/sys/amd64/debug.c
+++ b/sys/amd64/debug.c
@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/mp.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/atomic.h>
 #include <machine/trap.h>
 #include <machine/lapic.h>
diff --git a/sys/amd64/include/amd64.h b/sys/amd64/include/cpu.h
similarity index 99%
rename from sys/amd64/include/amd64.h
rename to sys/amd64/include/cpu.h
index d317ca0..d9259dd 100644
--- a/sys/amd64/include/amd64.h
+++ b/sys/amd64/include/cpu.h
@@ -223,7 +223,7 @@ typedef struct XSAVEArea
 #define MSR_CSTAR   0xC0000083
 #define MSR_SFMASK  0xC0000084
 
-#include "amd64op.h"
+#include "cpuop.h"
 
 #endif /* __AMD64_H__ */
 
diff --git a/sys/amd64/include/amd64op.h b/sys/amd64/include/cpuop.h
similarity index 100%
rename from sys/amd64/include/amd64op.h
rename to sys/amd64/include/cpuop.h
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 24519c2..67909b1 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -2,7 +2,7 @@
 #ifndef __PMAP_H__
 #define __PMAP_H__
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 
 /*
  * +----------------------+
diff --git a/sys/amd64/include/thread.h b/sys/amd64/include/thread.h
index 3cdd7e1..f5d2bd5 100644
--- a/sys/amd64/include/thread.h
+++ b/sys/amd64/include/thread.h
@@ -2,8 +2,8 @@
 #ifndef __MACHINE_THREAD_H__
 #define __MACHINE_THREAD_H__
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 typedef struct ThreadArchStackFrame {
     uint64_t		r15;
diff --git a/sys/amd64/ioapic.c b/sys/amd64/ioapic.c
index 20bc7ac..8962e1a 100644
--- a/sys/amd64/ioapic.c
+++ b/sys/amd64/ioapic.c
@@ -9,7 +9,7 @@
 #include <sys/kdebug.h>
 #include <sys/cdefs.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 #include <machine/trap.h>
 
diff --git a/sys/amd64/lapic.c b/sys/amd64/lapic.c
index c89effa..0e222d3 100644
--- a/sys/amd64/lapic.c
+++ b/sys/amd64/lapic.c
@@ -8,8 +8,8 @@
 #include <sys/kassert.h>
 #include <sys/kdebug.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/pmap.h>
 #include <machine/trap.h>
 
diff --git a/sys/amd64/machine.c b/sys/amd64/machine.c
index 7ab99f4..ca51465 100644
--- a/sys/amd64/machine.c
+++ b/sys/amd64/machine.c
@@ -8,7 +8,7 @@
 #include <sys/irq.h>
 #include <sys/spinlock.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/ioapic.h>
 #include <machine/lapic.h>
 #include <machine/trap.h>
diff --git a/sys/amd64/mbentry.c b/sys/amd64/mbentry.c
index 5cc008f..fed1098 100644
--- a/sys/amd64/mbentry.c
+++ b/sys/amd64/mbentry.c
@@ -10,7 +10,7 @@
 
 #include "../dev/console.h"
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 #include <machine/multiboot.h>
 
diff --git a/sys/amd64/mp.c b/sys/amd64/mp.c
index d0ef06c..743eceb 100644
--- a/sys/amd64/mp.c
+++ b/sys/amd64/mp.c
@@ -10,8 +10,8 @@
 #include <sys/ktime.h>
 #include <sys/mp.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/pmap.h>
 #include <machine/lapic.h>
 #include <machine/mp.h>
diff --git a/sys/amd64/pci.c b/sys/amd64/pci.c
index f6b1ff9..d007752 100644
--- a/sys/amd64/pci.c
+++ b/sys/amd64/pci.c
@@ -4,8 +4,8 @@
 #include <sys/kassert.h>
 #include <sys/pci.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 #define PCI_PORT_ADDR		0xCF8
 #define PCI_PORT_DATABASE	0xCFC
diff --git a/sys/amd64/pmap.c b/sys/amd64/pmap.c
index 9cf7a84..b3064ae 100644
--- a/sys/amd64/pmap.c
+++ b/sys/amd64/pmap.c
@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/kmem.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/mp.h>
 #include <machine/pmap.h>
 
diff --git a/sys/amd64/thread.c b/sys/amd64/thread.c
index a36fe1f..ca48948 100644
--- a/sys/amd64/thread.c
+++ b/sys/amd64/thread.c
@@ -8,8 +8,8 @@
 #include <sys/kmem.h>
 #include <sys/mp.h>
 #include <sys/thread.h>
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/trap.h>
 #include <machine/pmap.h>
 
diff --git a/sys/amd64/time.c b/sys/amd64/time.c
index 03a7d6f..c32183d 100644
--- a/sys/amd64/time.c
+++ b/sys/amd64/time.c
@@ -6,8 +6,8 @@
 #include <sys/kdebug.h>
 #include <sys/ktime.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 uint64_t
 Time_GetTSC()
diff --git a/sys/amd64/trap.c b/sys/amd64/trap.c
index ea70440..867ab05 100644
--- a/sys/amd64/trap.c
+++ b/sys/amd64/trap.c
@@ -12,7 +12,7 @@
 #include <sys/syscall.h>
 #include <sys/mp.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/lapic.h>
 #include <machine/trap.h>
 #include <machine/mp.h>
diff --git a/sys/amd64/xmem.c b/sys/amd64/xmem.c
index 13b373d..77f812c 100644
--- a/sys/amd64/xmem.c
+++ b/sys/amd64/xmem.c
@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/kmem.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/pmap.h>
 #include <machine/mp.h>
 
diff --git a/sys/dev/x86/debugcons.c b/sys/dev/x86/debugcons.c
index 45cf030..00716b6 100644
--- a/sys/dev/x86/debugcons.c
+++ b/sys/dev/x86/debugcons.c
@@ -7,8 +7,8 @@
 
 #include <sys/cdefs.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 void DebugConsole_Init()
 {
diff --git a/sys/dev/x86/ps2.c b/sys/dev/x86/ps2.c
index 7e93eda..e458181 100644
--- a/sys/dev/x86/ps2.c
+++ b/sys/dev/x86/ps2.c
@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/irq.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 #include "../console.h"
 #include "ps2.h"
diff --git a/sys/dev/x86/vgacons.c b/sys/dev/x86/vgacons.c
index 8957a46..5d6217a 100644
--- a/sys/dev/x86/vgacons.c
+++ b/sys/dev/x86/vgacons.c
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #include <sys/kdebug.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 
 #include "vgacons.h"
diff --git a/sys/kern/loader.c b/sys/kern/loader.c
index d0b9777..c984bff 100644
--- a/sys/kern/loader.c
+++ b/sys/kern/loader.c
@@ -14,7 +14,7 @@
 #include <sys/disk.h>
 #include <sys/elf64.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/trap.h>
 #include <machine/pmap.h>
 #include <sys/thread.h>
diff --git a/sys/kern/palloc.c b/sys/kern/palloc.c
index 375542d..0301bf1 100644
--- a/sys/kern/palloc.c
+++ b/sys/kern/palloc.c
@@ -16,7 +16,7 @@
 #include <sys/spinlock.h>
 
 // PGSIZE
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 
 /* 'FREEPAGE' */
diff --git a/sys/kern/spinlock.c b/sys/kern/spinlock.c
index 061ce50..84fdca2 100644
--- a/sys/kern/spinlock.c
+++ b/sys/kern/spinlock.c
@@ -15,8 +15,8 @@
 #include <sys/spinlock.h>
 
 #include <machine/atomic.h>
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 Spinlock lockListLock = {
     0, 0, 0, 0, 0, 0, 0,