diff --git a/headers/private/kernel/arch/x86/arch_acpi.h b/headers/private/kernel/acpi.h
similarity index 98%
rename from headers/private/kernel/arch/x86/arch_acpi.h
rename to headers/private/kernel/acpi.h
index 0e1ae043df..fc1cc285eb 100644
--- a/headers/private/kernel/arch/x86/arch_acpi.h
+++ b/headers/private/kernel/acpi.h
@@ -3,8 +3,8 @@
  * Copyright 2007, Michael Lotz, mmlr@mlotz.ch. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _KERNEL_ARCH_x86_ARCH_ACPI_H
-#define _KERNEL_ARCH_x86_ARCH_ACPI_H
+#ifndef _KERNEL_ACPI_H
+#define _KERNEL_ACPI_H
 
 #define ACPI_RSDP_SIGNATURE		"RSD PTR "
 #define ACPI_RSDT_SIGNATURE		"RSDT"
@@ -203,4 +203,4 @@ typedef struct acpi_local_x2_apic_nmi {
 } _PACKED acpi_local_x2_apic_nmi;
 
 
-#endif	/* _KERNEL_ARCH_x86_ARCH_ACPI_H */
+#endif	/* _KERNEL_ACPI_H */
diff --git a/headers/private/kernel/arch/x86/arch_hpet.h b/headers/private/kernel/arch/x86/arch_hpet.h
index e49003fa79..9a80245c08 100644
--- a/headers/private/kernel/arch/x86/arch_hpet.h
+++ b/headers/private/kernel/arch/x86/arch_hpet.h
@@ -5,7 +5,7 @@
 #ifndef _KERNEL_ARCH_x86_HPET_H
 #define _KERNEL_ARCH_x86_HPET_H
 
-#include <arch/x86/arch_acpi.h>
+#include <acpi.h>
 
 /* All masks are 32 bits wide to represent relative bit locations */
 /* Doing it this way is Required since the HPET only supports 32/64-bit aligned reads. */
diff --git a/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_acpi.cpp b/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_acpi.cpp
index 8ed93c44f2..69035fe271 100644
--- a/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_acpi.cpp
+++ b/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_acpi.cpp
@@ -17,7 +17,7 @@
 #include <KernelExport.h>
 
 #include <boot_item.h>
-#include <arch/x86/arch_acpi.h>
+#include <acpi.h>
 
 
 //#define TRACE_ACPI
diff --git a/src/system/boot/arch/x86/arch_hpet.cpp b/src/system/boot/arch/x86/arch_hpet.cpp
index ddc6c7bd6a..1f65273289 100644
--- a/src/system/boot/arch/x86/arch_hpet.cpp
+++ b/src/system/boot/arch/x86/arch_hpet.cpp
@@ -17,7 +17,6 @@
 #include <boot/stage2.h>
 #include <boot/arch/x86/arch_cpu.h>
 #include <boot/arch/x86/arch_hpet.h>
-#include <kernel/arch/x86/arch_acpi.h>
 #include <kernel/arch/x86/arch_hpet.h>
 
 #include <string.h>
diff --git a/src/system/boot/platform/bios_ia32/acpi.cpp b/src/system/boot/platform/bios_ia32/acpi.cpp
index 84b0fe57b0..f4c5c3d67d 100644
--- a/src/system/boot/platform/bios_ia32/acpi.cpp
+++ b/src/system/boot/platform/bios_ia32/acpi.cpp
@@ -17,8 +17,6 @@
 
 #include <KernelExport.h>
 
-#include <arch/x86/arch_acpi.h>
-
 
 //#define TRACE_ACPI
 #ifdef TRACE_ACPI
diff --git a/src/system/boot/platform/bios_ia32/acpi.h b/src/system/boot/platform/bios_ia32/acpi.h
index 5577a220a4..4d956ac4fa 100644
--- a/src/system/boot/platform/bios_ia32/acpi.h
+++ b/src/system/boot/platform/bios_ia32/acpi.h
@@ -6,7 +6,7 @@
 #define ACPI_H
 
 #include <SupportDefs.h>
-#include <arch/x86/arch_acpi.h>
+#include <kernel/acpi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/system/boot/platform/bios_ia32/smp.cpp b/src/system/boot/platform/bios_ia32/smp.cpp
index 0356bb9483..9956a2c95a 100644
--- a/src/system/boot/platform/bios_ia32/smp.cpp
+++ b/src/system/boot/platform/bios_ia32/smp.cpp
@@ -19,7 +19,6 @@
 #include <boot/stage2.h>
 #include <boot/menu.h>
 #include <arch/x86/apic.h>
-#include <arch/x86/arch_acpi.h>
 #include <arch/x86/arch_cpu.h>
 #include <arch/x86/arch_smp.h>
 #include <arch/x86/arch_system_info.h>
diff --git a/src/system/boot/platform/efi/acpi.cpp b/src/system/boot/platform/efi/acpi.cpp
index b87f766974..ae8b165c6d 100644
--- a/src/system/boot/platform/efi/acpi.cpp
+++ b/src/system/boot/platform/efi/acpi.cpp
@@ -17,7 +17,6 @@
 #include <KernelExport.h>
 #include <SupportDefs.h>
 
-#include <arch/x86/arch_acpi.h>
 #include <boot/stage2.h>
 #include <boot/platform.h>
 #include <boot/stdio.h>
diff --git a/src/system/boot/platform/efi/acpi.h b/src/system/boot/platform/efi/acpi.h
index 8d45c4b4fc..daa9f1f8e4 100644
--- a/src/system/boot/platform/efi/acpi.h
+++ b/src/system/boot/platform/efi/acpi.h
@@ -6,7 +6,7 @@
 #define ACPI_H
 
 #include <SupportDefs.h>
-#include <arch/x86/arch_acpi.h>
+#include <kernel/acpi.h>
 
 #ifdef __cplusplus
 extern "C" {