diff --git a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c
index a17a671fda..0ead4a795f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c
+++ b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c
@@ -114,30 +114,29 @@
  *****************************************************************************/
 
 
-#include <OS.h>
-#include <kernel.h>
+
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
 
+#include <OS.h>
+
+#ifdef _KERNEL_MODE
+#	include <KernelExport.h>
+
+#	include <dpc.h>
+#	include <PCI.h>
+
+#	include <kernel.h>
+#	include <vm/vm.h>
+#endif
+
 #include "acpi.h"
 #include "accommon.h"
 #include "amlcode.h"
 #include "acparser.h"
 #include "acdebug.h"
 
-#ifdef _KERNEL_MODE
-#include <KernelExport.h>
-
-#include <dpc.h>
-#include <PCI.h>
-#include <vm/vm.h>
-
-
-extern pci_module_info *gPCIManager;
-extern dpc_module_info *gDPC;
-extern void *gDPCHandle;
-#endif
 
 ACPI_MODULE_NAME("Haiku ACPI Module")
 
@@ -171,6 +170,12 @@ ACPI_MODULE_NAME("Haiku ACPI Module")
 #endif
 
 
+#ifdef _KERNEL_MODE
+extern pci_module_info *gPCIManager;
+extern dpc_module_info *gDPC;
+extern void *gDPCHandle;
+#endif
+
 extern FILE *AcpiGbl_DebugFile;
 FILE *AcpiGbl_OutputFile;