diff --git a/xtoskrnl/includes/amd64/hl.h b/xtoskrnl/includes/amd64/hl.h
new file mode 100644
index 0000000..a6749d9
--- /dev/null
+++ b/xtoskrnl/includes/amd64/hl.h
@@ -0,0 +1,53 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/amd64/hl.h
+ * DESCRIPTION:     XT hardware abstraction layer routines specific to AMD64 architecture
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_AMD64_HL_H
+#define __XTOSKRNL_AMD64_HL_H
+
+#include <xtos.h>
+
+
+/* HAL library routines forward references */
+XTCDECL
+VOID
+HlDisablePic(VOID);
+
+XTFASTCALL
+ULONG
+HlReadApicRegister(IN APIC_REGISTER Register);
+
+XTFASTCALL
+VOID
+HlWriteApicRegister(IN APIC_REGISTER Register,
+                    IN ULONG Value);
+
+XTAPI
+BOOLEAN
+HlpCheckX2ApicSupport(VOID);
+
+XTCDECL
+VOID
+HlpHandleApicSpuriousService();
+
+XTCDECL
+VOID
+HlpHandlePicSpuriousService();
+
+XTAPI
+VOID
+HlpInitializeApic(VOID);
+
+XTFASTCALL
+KRUNLEVEL
+HlpTransformApicTprToRunLevel(IN UCHAR Tpr);
+
+XTFASTCALL
+UCHAR
+HlpTransformRunLevelToApicTpr(IN KRUNLEVEL RunLevel);
+
+#endif /* __XTOSKRNL_AMD64_HL_H */
diff --git a/xtoskrnl/includes/hl.h b/xtoskrnl/includes/hl.h
index 4c680d5..423511f 100644
--- a/xtoskrnl/includes/hl.h
+++ b/xtoskrnl/includes/hl.h
@@ -12,10 +12,6 @@
 #include <xtos.h>
 
 /* HAL library routines forward references */
-XTCDECL
-VOID
-HlDisablePic(VOID);
-
 XTAPI
 VOID
 HlClearScreen(VOID);
@@ -59,45 +55,12 @@ XTAPI
 XTSTATUS
 HlInitializeFrameBuffer(VOID);
 
-XTFASTCALL
-ULONG
-HlReadApicRegister(IN APIC_REGISTER Register);
-
 XTFASTCALL
 VOID
 HlSetRunLevel(IN KRUNLEVEL RunLevel);
 
-XTFASTCALL
-VOID
-HlWriteApicRegister(IN APIC_REGISTER Register,
-                    IN ULONG Value);
-
-XTAPI
-BOOLEAN
-HlpCheckX2ApicSupport(VOID);
-
-XTCDECL
-VOID
-HlpHandleApicSpuriousService();
-
-XTCDECL
-VOID
-HlpHandlePicSpuriousService();
-
-XTAPI
-VOID
-HlpInitializeApic(VOID);
-
 XTAPI
 VOID
 HlInitializeProcessor(VOID);
 
-XTFASTCALL
-KRUNLEVEL
-HlpTransformApicTprToRunLevel(IN UCHAR Tpr);
-
-XTFASTCALL
-UCHAR
-HlpTransformRunLevelToApicTpr(IN KRUNLEVEL RunLevel);
-
 #endif /* __XTOSKRNL_HL_H */
diff --git a/xtoskrnl/includes/i686/hl.h b/xtoskrnl/includes/i686/hl.h
new file mode 100644
index 0000000..12b17a7
--- /dev/null
+++ b/xtoskrnl/includes/i686/hl.h
@@ -0,0 +1,53 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/i686/hl.h
+ * DESCRIPTION:     XT hardware abstraction layer routines specific to i686 architecture
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_I686_HL_H
+#define __XTOSKRNL_I686_HL_H
+
+#include <xtos.h>
+
+
+/* HAL library routines forward references */
+XTCDECL
+VOID
+HlDisablePic(VOID);
+
+XTFASTCALL
+ULONG
+HlReadApicRegister(IN APIC_REGISTER Register);
+
+XTFASTCALL
+VOID
+HlWriteApicRegister(IN APIC_REGISTER Register,
+                    IN ULONG Value);
+
+XTAPI
+BOOLEAN
+HlpCheckX2ApicSupport(VOID);
+
+XTCDECL
+VOID
+HlpHandleApicSpuriousService();
+
+XTCDECL
+VOID
+HlpHandlePicSpuriousService();
+
+XTAPI
+VOID
+HlpInitializeApic(VOID);
+
+XTFASTCALL
+KRUNLEVEL
+HlpTransformApicTprToRunLevel(IN UCHAR Tpr);
+
+XTFASTCALL
+UCHAR
+HlpTransformRunLevelToApicTpr(IN KRUNLEVEL RunLevel);
+
+#endif /* __XTOSKRNL_I686_HL_H */