diff --git a/xtoskrnl/includes/amd64/globals.h b/xtoskrnl/includes/amd64/globals.h
new file mode 100644
index 0000000..e655193
--- /dev/null
+++ b/xtoskrnl/includes/amd64/globals.h
@@ -0,0 +1,24 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/amd64/globals.h
+ * DESCRIPTION:     XT kernel global variables related to AMD64 architecture
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_AMD64_GLOBALS_H
+#define __XTOSKRNL_AMD64_GLOBALS_H
+
+#include <xtos.h>
+
+
+/* Initial GDT */
+EXTERN KGDTENTRY ArInitialGdt[GDT_ENTRIES];
+
+/* Initial IDT */
+EXTERN KIDTENTRY ArInitialIdt[IDT_ENTRIES];
+
+/* Initial TSS */
+EXTERN KTSS ArInitialTss;
+
+#endif /* __XTOSKRNL_AMD64_GLOBALS_H */
diff --git a/xtoskrnl/includes/globals.h b/xtoskrnl/includes/globals.h
index 7f3b5d8..a4b06ac 100644
--- a/xtoskrnl/includes/globals.h
+++ b/xtoskrnl/includes/globals.h
@@ -10,17 +10,9 @@
 #define __XTOSKRNL_GLOBALS_H
 
 #include <xtos.h>
+#include ARCH_HEADER(globals.h)
 
 
-/* Initial GDT */
-EXTERN KGDTENTRY ArInitialGdt[GDT_ENTRIES];
-
-/* Initial IDT */
-EXTERN KIDTENTRY ArInitialIdt[IDT_ENTRIES];
-
-/* Initial TSS */
-EXTERN KTSS ArInitialTss;
-
 /* FrameBuffer information */
 EXTERN HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
 
diff --git a/xtoskrnl/includes/i686/globals.h b/xtoskrnl/includes/i686/globals.h
new file mode 100644
index 0000000..b37f593
--- /dev/null
+++ b/xtoskrnl/includes/i686/globals.h
@@ -0,0 +1,24 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/i686/globals.h
+ * DESCRIPTION:     XT kernel global variables related to i686 architecture
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_I686_GLOBALS_H
+#define __XTOSKRNL_I686_GLOBALS_H
+
+#include <xtos.h>
+
+
+/* Initial GDT */
+EXTERN KGDTENTRY ArInitialGdt[GDT_ENTRIES];
+
+/* Initial IDT */
+EXTERN KIDTENTRY ArInitialIdt[IDT_ENTRIES];
+
+/* Initial TSS */
+EXTERN KTSS ArInitialTss;
+
+#endif /* __XTOSKRNL_I686_GLOBALS_H */