diff --git a/src/include/kernel/spinlock.h b/src/arch/x86_64/include/arch/spinlock.h
similarity index 82%
rename from src/include/kernel/spinlock.h
rename to src/arch/x86_64/include/arch/spinlock.h
index e8088030..7638a3ea 100644
--- a/src/include/kernel/spinlock.h
+++ b/src/arch/x86_64/include/arch/spinlock.h
@@ -1,8 +1,6 @@
 #ifndef _SPINLOCK_H_INCLUDE
 #define _SPINLOCK_H_INCLUDE
 
-// TODO rewrite this in a more arch independent way
-
 static inline void spinlock_acquire(int *lock){
 	while(!__sync_bool_compare_and_swap(lock, 0, 1)) asm("pause");
 }
diff --git a/src/sys/mm/pmm.c b/src/sys/mm/pmm.c
index 9b5c6cef..8e12bd7b 100644
--- a/src/sys/mm/pmm.c
+++ b/src/sys/mm/pmm.c
@@ -3,7 +3,7 @@
 #include <limine.h>
 #include <stdio.h>
 #include <string.h>
-#include <kernel/spinlock.h>
+#include <arch/spinlock.h>
 
 #define PAGE_SIZE 4096
 
diff --git a/src/sys/mm/vmm.c b/src/sys/mm/vmm.c
index 4d05b8c2..147299cd 100644
--- a/src/sys/mm/vmm.c
+++ b/src/sys/mm/vmm.c
@@ -2,7 +2,7 @@
 #include <kernel/pmm.h>
 #include <arch/panic.h>
 #include <string.h>
-#include <kernel/spinlock.h>
+#include <arch/spinlock.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <limine.h>