Index: drivers/bus/acpi/acpica/include/actypes.h
===================================================================
--- drivers/bus/acpi/acpica/include/actypes.h	(révision 62605)
+++ drivers/bus/acpi/acpica/include/actypes.h	(révision 62606)
@@ -196,11 +196,11 @@
  *
  ******************************************************************************/
 
-typedef unsigned char                   BOOLEAN;
-typedef unsigned char                   UINT8;
-typedef unsigned short                  UINT16;
-typedef COMPILER_DEPENDENT_UINT64       UINT64;
-typedef COMPILER_DEPENDENT_INT64        INT64;
+// typedef unsigned char                   BOOLEAN;
+// typedef unsigned char                   UINT8;
+// typedef unsigned short                  UINT16;
+// typedef COMPILER_DEPENDENT_UINT64       UINT64;
+// typedef COMPILER_DEPENDENT_INT64        INT64;
 
 /*! [End] no source code translation !*/
 
@@ -225,8 +225,8 @@
 
 /*! [Begin] no source code translation (keep the typedefs as-is) */
 
-typedef unsigned int                    UINT32;
-typedef int                             INT32;
+// typedef unsigned int                    UINT32;
+// typedef int                             INT32;
 
 /*! [End] no source code translation !*/
 
@@ -264,8 +264,8 @@
 
 /*! [Begin] no source code translation (keep the typedefs as-is) */
 
-typedef unsigned int                    UINT32;
-typedef int                             INT32;
+// typedef unsigned int                    UINT32;
+// typedef int                             INT32;
 
 /*! [End] no source code translation !*/
 
Index: drivers/bus/acpi/acpica/include/acpi.h
===================================================================
--- drivers/bus/acpi/acpica/include/acpi.h	(révision 62606)
+++ drivers/bus/acpi/acpica/include/acpi.h	(révision 62607)
@@ -117,6 +117,12 @@
 #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.
  *
  * Information includes the ACPICA data types, names, exceptions, and
Index: drivers/bus/acpi/precomp.h
===================================================================
--- drivers/bus/acpi/precomp.h	(révision 62606)
+++ drivers/bus/acpi/precomp.h	(révision 62607)
@@ -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>