diff --git a/reactos/drivers/bus/acpi/acpica/include/acpi.h b/reactos/drivers/bus/acpi/acpica/include/acpi.h
index 9c8bc8d61a6..e39627b8de2 100644
--- a/reactos/drivers/bus/acpi/acpica/include/acpi.h
+++ b/reactos/drivers/bus/acpi/acpica/include/acpi.h
@@ -116,6 +116,12 @@
 #ifndef __ACPI_H__
 #define __ACPI_H__
 
+/*
+ * Header inclusion HACK (see modifications to actypes.h too).
+ */
+#include <ntddk.h>
+#undef ACPI_BIOS_ERROR  // ACPI_BIOS_ERROR is redefined in acoutput.h
+
 /*
  * Public include files for use by code that will interface to ACPICA.
  *
diff --git a/reactos/drivers/bus/acpi/precomp.h b/reactos/drivers/bus/acpi/precomp.h
index fcb766d3eeb..43c15b6a49f 100644
--- a/reactos/drivers/bus/acpi/precomp.h
+++ b/reactos/drivers/bus/acpi/precomp.h
@@ -1,7 +1,14 @@
 #ifndef _ACPI_PCH_
 #define _ACPI_PCH_
 
+#include <stdio.h>
+
 #include <acpi.h>
+
+// ACPI_BIOS_ERROR was defined in acoutput.h, but is
+// redefined in bugcodes.h included from the DDK.
+#undef ACPI_BIOS_ERROR
+
 #include <acpisys.h>
 #include <acpi_bus.h>
 #include <acpi_drivers.h>