diff --git a/arch/i686/cpu/gdt.hpp b/arch/i686/cpu/gdt.hpp
new file mode 100644
index 0000000..86ce86a
--- /dev/null
+++ b/arch/i686/cpu/gdt.hpp
@@ -0,0 +1,11 @@
+#ifndef __FENNIX_KERNEL_GDT_H__
+#define __FENNIX_KERNEL_GDT_H__
+
+#include <types.h>
+
+namespace GlobalDescriptorTable
+{
+    void Init(int Core);
+}
+
+#endif // !__FENNIX_KERNEL_GDT_H__
diff --git a/arch/i686/cpu/idt.hpp b/arch/i686/cpu/idt.hpp
new file mode 100644
index 0000000..41e6446
--- /dev/null
+++ b/arch/i686/cpu/idt.hpp
@@ -0,0 +1,11 @@
+#ifndef __FENNIX_KERNEL_IDT_H__
+#define __FENNIX_KERNEL_IDT_H__
+
+#include <types.h>
+
+namespace InterruptDescriptorTable
+{
+    void Init(int Core);
+}
+
+#endif // !__FENNIX_KERNEL_IDT_H__
diff --git a/core/Interrupts/IntManager.cpp b/core/Interrupts/IntManager.cpp
index 8abc412..5305481 100644
--- a/core/Interrupts/IntManager.cpp
+++ b/core/Interrupts/IntManager.cpp
@@ -7,8 +7,6 @@
 #include "../arch/i686/cpu/gdt.hpp"
 #include "../arch/i686/cpu/idt.hpp"
 #elif defined(__aarch64__)
-#include "../arch/aarch64/cpu/gdt.hpp"
-#include "../arch/aarch64/cpu/idt.hpp"
 #endif
 
 namespace Interrupts