From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 9 Jan 2006 00:41:48 +0000 (+0000)
Subject: - Make ACPI use PCH. Cuts down compile time to 9 seconds on gcc.
X-Git-Tag: backups/expat-rbuild@40467~416
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=627eebfc7bd09900eafd033b475213f8c8646670

- Make ACPI use PCH. Cuts down compile time to 9 seconds on gcc.

svn path=/trunk/; revision=20747
---

diff --git a/reactos/drivers/bus/acpi/acpi.xml b/reactos/drivers/bus/acpi/acpi.xml
index a3960c156fe..968812ad9d9 100644
--- a/reactos/drivers/bus/acpi/acpi.xml
+++ b/reactos/drivers/bus/acpi/acpi.xml
@@ -134,4 +134,5 @@
 		<file>cmxface.c</file>
 	</directory>
 	<file>acpi.rc</file>
+	<pch>include/acpi.h</pch>
 </module>
diff --git a/reactos/drivers/bus/acpi/dispatcher/dsfield.c b/reactos/drivers/bus/acpi/dispatcher/dsfield.c
index c4ca92b278f..191a9e92cfe 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dsfield.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsfield.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsfield")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dsmethod.c b/reactos/drivers/bus/acpi/dispatcher/dsmethod.c
index c400a9ab991..70b2349ae68 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dsmethod.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsmethod.c
@@ -24,15 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acdebug.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsmethod")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c b/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c
index 69a4a92484a..f51304017c5 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c
@@ -24,13 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsmthdat")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dsobject.c b/reactos/drivers/bus/acpi/dispatcher/dsobject.c
index 7bedc0fda1a..29f18fa9fb9 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dsobject.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsobject.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsobject")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dsopcode.c b/reactos/drivers/bus/acpi/dispatcher/dsopcode.c
index 459b81affa9..4a68ef8ac47 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dsopcode.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsopcode.c
@@ -25,14 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "actables.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsopcode")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dsutils.c b/reactos/drivers/bus/acpi/dispatcher/dsutils.c
index 82b3814d798..c87469493aa 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dsutils.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsutils.c
@@ -24,13 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdebug.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsutils")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dswexec.c b/reactos/drivers/bus/acpi/dispatcher/dswexec.c
index 3105525ba89..b114cf9a800 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dswexec.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswexec.c
@@ -25,14 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdebug.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswexec")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dswload.c b/reactos/drivers/bus/acpi/dispatcher/dswload.c
index 4c072edbd94..b810d5f6b4a 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dswload.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswload.c
@@ -24,14 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acevents.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswload")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dswscope.c b/reactos/drivers/bus/acpi/dispatcher/dswscope.c
index 9813df5a462..87bdfd49bce 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dswscope.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswscope.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acdispat.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswscope")
diff --git a/reactos/drivers/bus/acpi/dispatcher/dswstate.c b/reactos/drivers/bus/acpi/dispatcher/dswstate.c
index 99632f03e23..80e9933074a 100644
--- a/reactos/drivers/bus/acpi/dispatcher/dswstate.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswstate.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acnamesp.h"
-#include "acinterp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswstate")
diff --git a/reactos/drivers/bus/acpi/events/evevent.c b/reactos/drivers/bus/acpi/events/evevent.c
index 319a2d3d1b8..5eba361a758 100644
--- a/reactos/drivers/bus/acpi/events/evevent.c
+++ b/reactos/drivers/bus/acpi/events/evevent.c
@@ -24,11 +24,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "acpi.h"
-#include "achware.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "accommon.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evevent")
diff --git a/reactos/drivers/bus/acpi/events/evmisc.c b/reactos/drivers/bus/acpi/events/evmisc.c
index 16f0d47a659..7d137d1d48a 100644
--- a/reactos/drivers/bus/acpi/events/evmisc.c
+++ b/reactos/drivers/bus/acpi/events/evmisc.c
@@ -24,11 +24,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "achware.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evmisc")
diff --git a/reactos/drivers/bus/acpi/events/evregion.c b/reactos/drivers/bus/acpi/events/evregion.c
index b94806d0502..61bb39269b4 100644
--- a/reactos/drivers/bus/acpi/events/evregion.c
+++ b/reactos/drivers/bus/acpi/events/evregion.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evregion")
diff --git a/reactos/drivers/bus/acpi/events/evrgnini.c b/reactos/drivers/bus/acpi/events/evrgnini.c
index 72e9a30b42f..e37e78a4c63 100644
--- a/reactos/drivers/bus/acpi/events/evrgnini.c
+++ b/reactos/drivers/bus/acpi/events/evrgnini.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evrgnini")
diff --git a/reactos/drivers/bus/acpi/events/evsci.c b/reactos/drivers/bus/acpi/events/evsci.c
index a132393e042..748c5f73904 100644
--- a/reactos/drivers/bus/acpi/events/evsci.c
+++ b/reactos/drivers/bus/acpi/events/evsci.c
@@ -24,11 +24,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evsci")
diff --git a/reactos/drivers/bus/acpi/events/evxface.c b/reactos/drivers/bus/acpi/events/evxface.c
index eb6563e15d5..cef2200c4e8 100644
--- a/reactos/drivers/bus/acpi/events/evxface.c
+++ b/reactos/drivers/bus/acpi/events/evxface.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acinterp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evxface")
diff --git a/reactos/drivers/bus/acpi/events/evxfevnt.c b/reactos/drivers/bus/acpi/events/evxfevnt.c
index 7eb308c36f8..439f62e7931 100644
--- a/reactos/drivers/bus/acpi/events/evxfevnt.c
+++ b/reactos/drivers/bus/acpi/events/evxfevnt.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acinterp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evxfevnt")
diff --git a/reactos/drivers/bus/acpi/events/evxfregn.c b/reactos/drivers/bus/acpi/events/evxfregn.c
index a675b09a374..e9d720e924a 100644
--- a/reactos/drivers/bus/acpi/events/evxfregn.c
+++ b/reactos/drivers/bus/acpi/events/evxfregn.c
@@ -25,12 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acinterp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evxfregn")
diff --git a/reactos/drivers/bus/acpi/executer/amconfig.c b/reactos/drivers/bus/acpi/executer/amconfig.c
index 983206fd4b6..b2e8c55e0f2 100644
--- a/reactos/drivers/bus/acpi/executer/amconfig.c
+++ b/reactos/drivers/bus/acpi/executer/amconfig.c
@@ -24,14 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "actables.h"
-#include "acdispat.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amconvrt.c b/reactos/drivers/bus/acpi/executer/amconvrt.c
index e355cc0b458..cb53d1429a6 100644
--- a/reactos/drivers/bus/acpi/executer/amconvrt.c
+++ b/reactos/drivers/bus/acpi/executer/amconvrt.c
@@ -24,14 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acdispat.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amconvrt")
diff --git a/reactos/drivers/bus/acpi/executer/amcreate.c b/reactos/drivers/bus/acpi/executer/amcreate.c
index 8822ebb3310..e8c5704546d 100644
--- a/reactos/drivers/bus/acpi/executer/amcreate.c
+++ b/reactos/drivers/bus/acpi/executer/amcreate.c
@@ -24,13 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "acdispat.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amdump.c b/reactos/drivers/bus/acpi/executer/amdump.c
index da1349282d3..4f04ee97033 100644
--- a/reactos/drivers/bus/acpi/executer/amdump.c
+++ b/reactos/drivers/bus/acpi/executer/amdump.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amdump")
diff --git a/reactos/drivers/bus/acpi/executer/amdyadic.c b/reactos/drivers/bus/acpi/executer/amdyadic.c
index 2dfe2f0946f..66744f89b6f 100644
--- a/reactos/drivers/bus/acpi/executer/amdyadic.c
+++ b/reactos/drivers/bus/acpi/executer/amdyadic.c
@@ -24,13 +24,8 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acdispat.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amfield.c b/reactos/drivers/bus/acpi/executer/amfield.c
index 3e41398fc33..cb3007c9b70 100644
--- a/reactos/drivers/bus/acpi/executer/amfield.c
+++ b/reactos/drivers/bus/acpi/executer/amfield.c
@@ -24,13 +24,8 @@
  */
 
 
-#include "acpi.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amfldio.c b/reactos/drivers/bus/acpi/executer/amfldio.c
index 651514b26bd..6804692d6ed 100644
--- a/reactos/drivers/bus/acpi/executer/amfldio.c
+++ b/reactos/drivers/bus/acpi/executer/amfldio.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/ammisc.c b/reactos/drivers/bus/acpi/executer/ammisc.c
index 0d7cd73cde6..b4adaf1c0df 100644
--- a/reactos/drivers/bus/acpi/executer/ammisc.c
+++ b/reactos/drivers/bus/acpi/executer/ammisc.c
@@ -25,11 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acdispat.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/ammonad.c b/reactos/drivers/bus/acpi/executer/ammonad.c
index ca042c4536f..e37e27d6905 100644
--- a/reactos/drivers/bus/acpi/executer/ammonad.c
+++ b/reactos/drivers/bus/acpi/executer/ammonad.c
@@ -25,12 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/ammutex.c b/reactos/drivers/bus/acpi/executer/ammutex.c
index a7ac010c13c..2a4091083b5 100644
--- a/reactos/drivers/bus/acpi/executer/ammutex.c
+++ b/reactos/drivers/bus/acpi/executer/ammutex.c
@@ -25,11 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("ammutex")
diff --git a/reactos/drivers/bus/acpi/executer/amnames.c b/reactos/drivers/bus/acpi/executer/amnames.c
index 605d002fdce..269631f49f0 100644
--- a/reactos/drivers/bus/acpi/executer/amnames.c
+++ b/reactos/drivers/bus/acpi/executer/amnames.c
@@ -25,10 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>
+
 
 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amnames")
diff --git a/reactos/drivers/bus/acpi/executer/amprep.c b/reactos/drivers/bus/acpi/executer/amprep.c
index 50e3f041bc7..351fb2bffe1 100644
--- a/reactos/drivers/bus/acpi/executer/amprep.c
+++ b/reactos/drivers/bus/acpi/executer/amprep.c
@@ -25,11 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acparser.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amregion.c b/reactos/drivers/bus/acpi/executer/amregion.c
index c0ea79e446b..a3e9e0a4a5f 100644
--- a/reactos/drivers/bus/acpi/executer/amregion.c
+++ b/reactos/drivers/bus/acpi/executer/amregion.c
@@ -25,12 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amresnte.c b/reactos/drivers/bus/acpi/executer/amresnte.c
index 1a07e0dbf07..9ddbc841728 100644
--- a/reactos/drivers/bus/acpi/executer/amresnte.c
+++ b/reactos/drivers/bus/acpi/executer/amresnte.c
@@ -25,14 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amresolv.c b/reactos/drivers/bus/acpi/executer/amresolv.c
index ce9952aec57..bdbaed6c3a6 100644
--- a/reactos/drivers/bus/acpi/executer/amresolv.c
+++ b/reactos/drivers/bus/acpi/executer/amresolv.c
@@ -25,14 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amresop.c b/reactos/drivers/bus/acpi/executer/amresop.c
index 9f11d97fb3b..58e9feb94de 100644
--- a/reactos/drivers/bus/acpi/executer/amresop.c
+++ b/reactos/drivers/bus/acpi/executer/amresop.c
@@ -25,14 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amstore.c b/reactos/drivers/bus/acpi/executer/amstore.c
index cb262c1225c..136373a0c63 100644
--- a/reactos/drivers/bus/acpi/executer/amstore.c
+++ b/reactos/drivers/bus/acpi/executer/amstore.c
@@ -25,13 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amstoren.c b/reactos/drivers/bus/acpi/executer/amstoren.c
index 6f27aea6582..aacf99e24f4 100644
--- a/reactos/drivers/bus/acpi/executer/amstoren.c
+++ b/reactos/drivers/bus/acpi/executer/amstoren.c
@@ -26,13 +26,8 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amstorob.c b/reactos/drivers/bus/acpi/executer/amstorob.c
index 388ffd4e0b0..a0d25c731e4 100644
--- a/reactos/drivers/bus/acpi/executer/amstorob.c
+++ b/reactos/drivers/bus/acpi/executer/amstorob.c
@@ -25,13 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/executer/amsystem.c b/reactos/drivers/bus/acpi/executer/amsystem.c
index f42910fb97c..aff86885139 100644
--- a/reactos/drivers/bus/acpi/executer/amsystem.c
+++ b/reactos/drivers/bus/acpi/executer/amsystem.c
@@ -25,11 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amsystem")
diff --git a/reactos/drivers/bus/acpi/executer/amutils.c b/reactos/drivers/bus/acpi/executer/amutils.c
index 8e03414acf0..21cd25c8c69 100644
--- a/reactos/drivers/bus/acpi/executer/amutils.c
+++ b/reactos/drivers/bus/acpi/executer/amutils.c
@@ -25,12 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
+#include <acpi.h>
+
 
 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amutils")
diff --git a/reactos/drivers/bus/acpi/executer/amxface.c b/reactos/drivers/bus/acpi/executer/amxface.c
index 816672c981b..7ce20ddd6b4 100644
--- a/reactos/drivers/bus/acpi/executer/amxface.c
+++ b/reactos/drivers/bus/acpi/executer/amxface.c
@@ -25,8 +25,8 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
+#include <acpi.h>
+
 
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/reactos/drivers/bus/acpi/hardware/hwacpi.c b/reactos/drivers/bus/acpi/hardware/hwacpi.c
index e22374bb535..b1504fa17c6 100644
--- a/reactos/drivers/bus/acpi/hardware/hwacpi.c
+++ b/reactos/drivers/bus/acpi/hardware/hwacpi.c
@@ -25,9 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwacpi")
diff --git a/reactos/drivers/bus/acpi/hardware/hwgpe.c b/reactos/drivers/bus/acpi/hardware/hwgpe.c
index 1741bc73626..9d7ed9e6ebd 100644
--- a/reactos/drivers/bus/acpi/hardware/hwgpe.c
+++ b/reactos/drivers/bus/acpi/hardware/hwgpe.c
@@ -24,10 +24,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwgpe")
diff --git a/reactos/drivers/bus/acpi/hardware/hwregs.c b/reactos/drivers/bus/acpi/hardware/hwregs.c
index e3370280290..658d5c8167d 100644
--- a/reactos/drivers/bus/acpi/hardware/hwregs.c
+++ b/reactos/drivers/bus/acpi/hardware/hwregs.c
@@ -26,9 +26,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwregs")
diff --git a/reactos/drivers/bus/acpi/hardware/hwsleep.c b/reactos/drivers/bus/acpi/hardware/hwsleep.c
index 0aa8d9d110e..a30fbe624a3 100644
--- a/reactos/drivers/bus/acpi/hardware/hwsleep.c
+++ b/reactos/drivers/bus/acpi/hardware/hwsleep.c
@@ -24,9 +24,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "achware.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwsleep")
diff --git a/reactos/drivers/bus/acpi/hardware/hwtimer.c b/reactos/drivers/bus/acpi/hardware/hwtimer.c
index 5405de669dc..06dfbbee535 100644
--- a/reactos/drivers/bus/acpi/hardware/hwtimer.c
+++ b/reactos/drivers/bus/acpi/hardware/hwtimer.c
@@ -24,8 +24,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "acpi.h"
-#include "achware.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwtimer")
diff --git a/reactos/drivers/bus/acpi/include/acexcep.h b/reactos/drivers/bus/acpi/include/acexcep.h
index 91d76ec0b09..82089e31079 100644
--- a/reactos/drivers/bus/acpi/include/acexcep.h
+++ b/reactos/drivers/bus/acpi/include/acexcep.h
@@ -146,102 +146,5 @@
 #define AE_CODE_CTRL_MAX                0x0008
 
 
-#ifdef DEFINE_ACPI_GLOBALS
-
-/*
- * String versions of the exception codes above
- * These strings must match the corresponding defines exactly
- */
-static NATIVE_CHAR          *acpi_gbl_exception_names_env[] =
-{
-	"AE_OK",
-	"AE_ERROR",
-	"AE_NO_ACPI_TABLES",
-	"AE_NO_NAMESPACE",
-	"AE_NO_MEMORY",
-	"AE_NOT_FOUND",
-	"AE_NOT_EXIST",
-	"AE_EXIST",
-	"AE_TYPE",
-	"AE_NULL_OBJECT",
-	"AE_NULL_ENTRY",
-	"AE_BUFFER_OVERFLOW",
-	"AE_STACK_OVERFLOW",
-	"AE_STACK_UNDERFLOW",
-	"AE_NOT_IMPLEMENTED",
-	"AE_VERSION_MISMATCH",
-	"AE_SUPPORT",
-	"AE_SHARE",
-	"AE_LIMIT",
-	"AE_TIME",
-	"AE_UNKNOWN_STATUS",
-	"AE_ACQUIRE_DEADLOCK",
-	"AE_RELEASE_DEADLOCK",
-	"AE_NOT_ACQUIRED",
-	"AE_ALREADY_ACQUIRED",
-	"AE_NO_HARDWARE_RESPONSE",
-	"AE_NO_GLOBAL_LOCK",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_pgm[] =
-{
-	"AE_BAD_PARAMETER",
-	"AE_BAD_CHARACTER",
-	"AE_BAD_PATHNAME",
-	"AE_BAD_DATA",
-	"AE_BAD_ADDRESS",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_tbl[] =
-{
-	"AE_BAD_SIGNATURE",
-	"AE_BAD_HEADER",
-	"AE_BAD_CHECKSUM",
-	"AE_BAD_VALUE",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_aml[] =
-{
-	"AE_AML_ERROR",
-	"AE_AML_PARSE",
-	"AE_AML_BAD_OPCODE",
-	"AE_AML_NO_OPERAND",
-	"AE_AML_OPERAND_TYPE",
-	"AE_AML_OPERAND_VALUE",
-	"AE_AML_UNINITIALIZED_LOCAL",
-	"AE_AML_UNINITIALIZED_ARG",
-	"AE_AML_UNINITIALIZED_ELEMENT",
-	"AE_AML_NUMERIC_OVERFLOW",
-	"AE_AML_REGION_LIMIT",
-	"AE_AML_BUFFER_LIMIT",
-	"AE_AML_PACKAGE_LIMIT",
-	"AE_AML_DIVIDE_BY_ZERO",
-	"AE_AML_BAD_NAME",
-	"AE_AML_NAME_NOT_FOUND",
-	"AE_AML_INTERNAL",
-	"AE_AML_INVALID_SPACE_ID",
-	"AE_AML_STRING_LIMIT",
-	"AE_AML_NO_RETURN_VALUE",
-	"AE_AML_METHOD_LIMIT",
-	"AE_AML_NOT_OWNER",
-	"AE_AML_MUTEX_ORDER",
-	"AE_AML_MUTEX_NOT_ACQUIRED",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_ctrl[] =
-{
-	"AE_CTRL_RETURN_VALUE",
-	"AE_CTRL_PENDING",
-	"AE_CTRL_TERMINATE",
-	"AE_CTRL_TRUE",
-	"AE_CTRL_FALSE",
-	"AE_CTRL_DEPTH",
-	"AE_CTRL_END",
-	"AE_CTRL_TRANSFER",
-};
-
-
-#endif /* DEFINE_ACPI_GLOBALS */
-
 
 #endif /* __ACEXCEP_H__ */
diff --git a/reactos/drivers/bus/acpi/include/acpi.h b/reactos/drivers/bus/acpi/include/acpi.h
index 7aaf7ae7466..051fe6563cc 100644
--- a/reactos/drivers/bus/acpi/include/acpi.h
+++ b/reactos/drivers/bus/acpi/include/acpi.h
@@ -29,6 +29,7 @@
 #include "platform/types.h"
 #undef ROUND_DOWN
 #undef ROUND_UP
+#define DEFINE_ACPI_GLOBALS
 
 /*
  * Common includes for all ACPI driver files
@@ -51,6 +52,18 @@
 #include "achware.h"            /* Hardware defines and interfaces */
 #include "accommon.h"           /* Common interfaces */
 #include "acresrc.h"            /* Resource Manager function prototypes */
-
+#include "acparser.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
+#include "acevents.h"
+#include "actables.h"
+#include "acdispat.h"
+#include <ntddk.h>
+#include <bm.h>
+#include <bn.h>
+#include <bmpower.h>
+#include <acpisys.h>
+#include <acglobal.h>
 
 #endif /* __ACPI_H__ */
diff --git a/reactos/drivers/bus/acpi/namespace/nsaccess.c b/reactos/drivers/bus/acpi/namespace/nsaccess.c
index 90364af4414..4da6b907bf7 100644
--- a/reactos/drivers/bus/acpi/namespace/nsaccess.c
+++ b/reactos/drivers/bus/acpi/namespace/nsaccess.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdispat.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsaccess")
diff --git a/reactos/drivers/bus/acpi/namespace/nsalloc.c b/reactos/drivers/bus/acpi/namespace/nsalloc.c
index eba25d40db6..00f79882669 100644
--- a/reactos/drivers/bus/acpi/namespace/nsalloc.c
+++ b/reactos/drivers/bus/acpi/namespace/nsalloc.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsalloc")
diff --git a/reactos/drivers/bus/acpi/namespace/nseval.c b/reactos/drivers/bus/acpi/namespace/nseval.c
index 1eaf2514e4b..63647e0d92e 100644
--- a/reactos/drivers/bus/acpi/namespace/nseval.c
+++ b/reactos/drivers/bus/acpi/namespace/nseval.c
@@ -25,12 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nseval")
diff --git a/reactos/drivers/bus/acpi/namespace/nsinit.c b/reactos/drivers/bus/acpi/namespace/nsinit.c
index 508528f8c12..81ed0fe3c2c 100644
--- a/reactos/drivers/bus/acpi/namespace/nsinit.c
+++ b/reactos/drivers/bus/acpi/namespace/nsinit.c
@@ -24,9 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "acdispat.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsinit")
diff --git a/reactos/drivers/bus/acpi/namespace/nsload.c b/reactos/drivers/bus/acpi/namespace/nsload.c
index ad62f7eecdf..a74bf573d40 100644
--- a/reactos/drivers/bus/acpi/namespace/nsload.c
+++ b/reactos/drivers/bus/acpi/namespace/nsload.c
@@ -24,14 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acdebug.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsload")
diff --git a/reactos/drivers/bus/acpi/namespace/nsnames.c b/reactos/drivers/bus/acpi/namespace/nsnames.c
index 724f0ff6958..e39a344ff5d 100644
--- a/reactos/drivers/bus/acpi/namespace/nsnames.c
+++ b/reactos/drivers/bus/acpi/namespace/nsnames.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsnames")
diff --git a/reactos/drivers/bus/acpi/namespace/nsobject.c b/reactos/drivers/bus/acpi/namespace/nsobject.c
index 528d07d73af..e0344acf646 100644
--- a/reactos/drivers/bus/acpi/namespace/nsobject.c
+++ b/reactos/drivers/bus/acpi/namespace/nsobject.c
@@ -25,12 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "actables.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsobject")
diff --git a/reactos/drivers/bus/acpi/namespace/nssearch.c b/reactos/drivers/bus/acpi/namespace/nssearch.c
index 7fc80623962..53d6f19568b 100644
--- a/reactos/drivers/bus/acpi/namespace/nssearch.c
+++ b/reactos/drivers/bus/acpi/namespace/nssearch.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nssearch")
diff --git a/reactos/drivers/bus/acpi/namespace/nsutils.c b/reactos/drivers/bus/acpi/namespace/nsutils.c
index 3eb6851f8e6..268352075b8 100644
--- a/reactos/drivers/bus/acpi/namespace/nsutils.c
+++ b/reactos/drivers/bus/acpi/namespace/nsutils.c
@@ -25,11 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "actables.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsutils")
diff --git a/reactos/drivers/bus/acpi/namespace/nswalk.c b/reactos/drivers/bus/acpi/namespace/nswalk.c
index 9ff403c3f5b..ddfdecdc97c 100644
--- a/reactos/drivers/bus/acpi/namespace/nswalk.c
+++ b/reactos/drivers/bus/acpi/namespace/nswalk.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nswalk")
diff --git a/reactos/drivers/bus/acpi/namespace/nsxfname.c b/reactos/drivers/bus/acpi/namespace/nsxfname.c
index c2a50ec90d1..780919c4a63 100644
--- a/reactos/drivers/bus/acpi/namespace/nsxfname.c
+++ b/reactos/drivers/bus/acpi/namespace/nsxfname.c
@@ -25,13 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acevents.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/reactos/drivers/bus/acpi/namespace/nsxfobj.c b/reactos/drivers/bus/acpi/namespace/nsxfobj.c
index 36849d9f578..1eaaedfbf7c 100644
--- a/reactos/drivers/bus/acpi/namespace/nsxfobj.c
+++ b/reactos/drivers/bus/acpi/namespace/nsxfobj.c
@@ -25,11 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdispat.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsxfobj")
diff --git a/reactos/drivers/bus/acpi/ospm/acpienum.c b/reactos/drivers/bus/acpi/ospm/acpienum.c
index 8fd97b8690c..6edac4e1d44 100644
--- a/reactos/drivers/bus/acpi/ospm/acpienum.c
+++ b/reactos/drivers/bus/acpi/ospm/acpienum.c
@@ -7,8 +7,7 @@
  * UPDATE HISTORY:
  *      01-05-2001  CSH  Created
  */
-#include <acpisys.h>
-#include <bm.h>
+#include <acpi.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/drivers/bus/acpi/ospm/acpisys.c b/reactos/drivers/bus/acpi/ospm/acpisys.c
index 6a6a9d83d60..cf6002f1498 100644
--- a/reactos/drivers/bus/acpi/ospm/acpisys.c
+++ b/reactos/drivers/bus/acpi/ospm/acpisys.c
@@ -7,9 +7,7 @@
  * UPDATE HISTORY:
  *      01-05-2001  CSH  Created
  */
-#include <acpisys.h>
-#include <bm.h>
-#include <bn.h>
+#include <acpi.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/drivers/bus/acpi/ospm/bn.c b/reactos/drivers/bus/acpi/ospm/bn.c
index 29958874922..6df7113a533 100644
--- a/reactos/drivers/bus/acpi/ospm/bn.c
+++ b/reactos/drivers/bus/acpi/ospm/bn.c
@@ -24,8 +24,6 @@
  */
 
 #include <acpi.h>
-#include "bn.h"
-
 
 #define _COMPONENT		ACPI_BUTTON
 	MODULE_NAME		("bn")
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bm.c b/reactos/drivers/bus/acpi/ospm/busmgr/bm.c
index 2388744eb7d..42253ae36dc 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bm.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bm.c
@@ -25,7 +25,7 @@
 
 
 #include <acpi.h>
-#include "bm.h"
+
 
 
 #define _COMPONENT		ACPI_BUS_MANAGER
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c
index 952dfcb55a8..1f6e4176061 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c
@@ -25,7 +25,7 @@
 
 
 #include <acpi.h>
-#include "bm.h"
+
 
 
 #define _COMPONENT		ACPI_BUS_MANAGER
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c
index 89d8add4b26..61d65aef58e 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c
@@ -25,8 +25,6 @@
 
 
 #include <acpi.h>
-#include "bm.h"
-#include "bmpower.h"
 
 
 #define _COMPONENT		ACPI_POWER_CONTROL
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c
index 6b04ea7c5f0..759c6d7cf0f 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c
@@ -34,9 +34,6 @@
 
 
 #include <acpi.h>
-#include "bm.h"
-#include "bmpower.h"
-
 
 #define _COMPONENT		ACPI_POWER_CONTROL
 	MODULE_NAME		("bmpower")
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c
index d0485366bcc..d02ee941bef 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c
@@ -25,7 +25,6 @@
 
 
 #include <acpi.h>
-#include "bm.h"
 
 #define _COMPONENT		ACPI_BUS_MANAGER
 	MODULE_NAME		("bmrequest")
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c
index b7491199cd7..ed3714938fd 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c
@@ -25,7 +25,6 @@
 
 
 #include <acpi.h>
-#include "bm.h"
 
 
 #define _COMPONENT		ACPI_BUS_MANAGER
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c
index 6d263066d63..5eda0703f58 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c
@@ -25,8 +25,6 @@
 
 
 #include <acpi.h>
-#include "bm.h"
-
 
 #define _COMPONENT		ACPI_BUS_MANAGER
 	MODULE_NAME		("bmutils")
diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c
index 7d7578c70ff..34b86fad4e8 100644
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c
@@ -25,7 +25,6 @@
 
 
 #include <acpi.h>
-#include "bm.h"
 
 #define _COMPONENT		ACPI_BUS_MANAGER
 	MODULE_NAME		("bmxface")
diff --git a/reactos/drivers/bus/acpi/ospm/fdo.c b/reactos/drivers/bus/acpi/ospm/fdo.c
index 94228c762ac..7251735201b 100644
--- a/reactos/drivers/bus/acpi/ospm/fdo.c
+++ b/reactos/drivers/bus/acpi/ospm/fdo.c
@@ -8,9 +8,7 @@
  * UPDATE HISTORY:
  *      08-08-2001  CSH  Created
  */
-#include <acpisys.h>
-#include <bm.h>
-#include <bn.h>
+#include <acpi.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/drivers/bus/acpi/ospm/include/acpisys.h b/reactos/drivers/bus/acpi/ospm/include/acpisys.h
index 0120edfff53..80d3d7871f7 100644
--- a/reactos/drivers/bus/acpi/ospm/include/acpisys.h
+++ b/reactos/drivers/bus/acpi/ospm/include/acpisys.h
@@ -4,9 +4,6 @@
  * PURPOSE: ACPI bus driver definitions
  */
 #define ACPI_DEBUG
-#include <acpi.h>
-#include <ntddk.h>
-#include <bm.h>
 
 typedef ACPI_STATUS (*ACPI_DRIVER_FUNCTION)(VOID);
 
diff --git a/reactos/drivers/bus/acpi/ospm/osl.c b/reactos/drivers/bus/acpi/ospm/osl.c
index b9d46a2cd8c..893d3965f79 100644
--- a/reactos/drivers/bus/acpi/ospm/osl.c
+++ b/reactos/drivers/bus/acpi/ospm/osl.c
@@ -22,7 +22,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <acpisys.h>
+#include <acpi.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/drivers/bus/acpi/ospm/pdo.c b/reactos/drivers/bus/acpi/ospm/pdo.c
index 278dfc7bd53..8a570f8218d 100644
--- a/reactos/drivers/bus/acpi/ospm/pdo.c
+++ b/reactos/drivers/bus/acpi/ospm/pdo.c
@@ -7,9 +7,7 @@
  * UPDATE HISTORY:
  *      08-08-2001  CSH  Created
  */
-#include <acpisys.h>
-#include <bm.h>
-#include <bn.h>
+#include <acpi.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/drivers/bus/acpi/parser/psargs.c b/reactos/drivers/bus/acpi/parser/psargs.c
index 1f14973c436..1eaa016c0a4 100644
--- a/reactos/drivers/bus/acpi/parser/psargs.c
+++ b/reactos/drivers/bus/acpi/parser/psargs.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psargs")
diff --git a/reactos/drivers/bus/acpi/parser/psopcode.c b/reactos/drivers/bus/acpi/parser/psopcode.c
index 9dfbe669dd9..5620157e779 100644
--- a/reactos/drivers/bus/acpi/parser/psopcode.c
+++ b/reactos/drivers/bus/acpi/parser/psopcode.c
@@ -24,9 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/reactos/drivers/bus/acpi/parser/psparse.c b/reactos/drivers/bus/acpi/parser/psparse.c
index 82e5d52656d..479756ad487 100644
--- a/reactos/drivers/bus/acpi/parser/psparse.c
+++ b/reactos/drivers/bus/acpi/parser/psparse.c
@@ -33,13 +33,7 @@
  * templates in Aml_op_info[]
  */
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acdebug.h"
-#include "acinterp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psparse")
diff --git a/reactos/drivers/bus/acpi/parser/psscope.c b/reactos/drivers/bus/acpi/parser/psscope.c
index 771e61329c1..77ff1b43f3f 100644
--- a/reactos/drivers/bus/acpi/parser/psscope.c
+++ b/reactos/drivers/bus/acpi/parser/psscope.c
@@ -24,8 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psscope")
diff --git a/reactos/drivers/bus/acpi/parser/pstree.c b/reactos/drivers/bus/acpi/parser/pstree.c
index 31d74fe943d..9260fca5263 100644
--- a/reactos/drivers/bus/acpi/parser/pstree.c
+++ b/reactos/drivers/bus/acpi/parser/pstree.c
@@ -24,9 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("pstree")
diff --git a/reactos/drivers/bus/acpi/parser/psutils.c b/reactos/drivers/bus/acpi/parser/psutils.c
index d41538f675a..6b331a5f277 100644
--- a/reactos/drivers/bus/acpi/parser/psutils.c
+++ b/reactos/drivers/bus/acpi/parser/psutils.c
@@ -24,9 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psutils")
diff --git a/reactos/drivers/bus/acpi/parser/pswalk.c b/reactos/drivers/bus/acpi/parser/pswalk.c
index 1b62bb13d7d..f2a90dd6e1d 100644
--- a/reactos/drivers/bus/acpi/parser/pswalk.c
+++ b/reactos/drivers/bus/acpi/parser/pswalk.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acnamesp.h"
-#include "acinterp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("pswalk")
diff --git a/reactos/drivers/bus/acpi/parser/psxface.c b/reactos/drivers/bus/acpi/parser/psxface.c
index 39689c69d56..ee25e842993 100644
--- a/reactos/drivers/bus/acpi/parser/psxface.c
+++ b/reactos/drivers/bus/acpi/parser/psxface.c
@@ -24,13 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psxface")
diff --git a/reactos/drivers/bus/acpi/resource/rsaddr.c b/reactos/drivers/bus/acpi/resource/rsaddr.c
index 57b1ac2e8df..5fdb6387eca 100644
--- a/reactos/drivers/bus/acpi/resource/rsaddr.c
+++ b/reactos/drivers/bus/acpi/resource/rsaddr.c
@@ -27,8 +27,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsaddr")
diff --git a/reactos/drivers/bus/acpi/resource/rscalc.c b/reactos/drivers/bus/acpi/resource/rscalc.c
index 8456688ee4a..28236e86c55 100644
--- a/reactos/drivers/bus/acpi/resource/rscalc.c
+++ b/reactos/drivers/bus/acpi/resource/rscalc.c
@@ -25,10 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rscalc")
diff --git a/reactos/drivers/bus/acpi/resource/rscreate.c b/reactos/drivers/bus/acpi/resource/rscreate.c
index c1fbef15605..a856093d6a9 100644
--- a/reactos/drivers/bus/acpi/resource/rscreate.c
+++ b/reactos/drivers/bus/acpi/resource/rscreate.c
@@ -26,10 +26,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rscreate")
diff --git a/reactos/drivers/bus/acpi/resource/rsdump.c b/reactos/drivers/bus/acpi/resource/rsdump.c
index fa7043a12ab..d28061352e8 100644
--- a/reactos/drivers/bus/acpi/resource/rsdump.c
+++ b/reactos/drivers/bus/acpi/resource/rsdump.c
@@ -24,8 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsdump")
diff --git a/reactos/drivers/bus/acpi/resource/rsio.c b/reactos/drivers/bus/acpi/resource/rsio.c
index 34936ef6284..a84b2a26b93 100644
--- a/reactos/drivers/bus/acpi/resource/rsio.c
+++ b/reactos/drivers/bus/acpi/resource/rsio.c
@@ -29,9 +29,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
-
+#include <acpi.h>
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsio")
 
diff --git a/reactos/drivers/bus/acpi/resource/rsirq.c b/reactos/drivers/bus/acpi/resource/rsirq.c
index 81c073fc355..b5dccbbd599 100644
--- a/reactos/drivers/bus/acpi/resource/rsirq.c
+++ b/reactos/drivers/bus/acpi/resource/rsirq.c
@@ -27,8 +27,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsirq")
diff --git a/reactos/drivers/bus/acpi/resource/rslist.c b/reactos/drivers/bus/acpi/resource/rslist.c
index 085ce1c3368..9c255d10846 100644
--- a/reactos/drivers/bus/acpi/resource/rslist.c
+++ b/reactos/drivers/bus/acpi/resource/rslist.c
@@ -25,8 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rslist")
diff --git a/reactos/drivers/bus/acpi/resource/rsmemory.c b/reactos/drivers/bus/acpi/resource/rsmemory.c
index b09c4900b68..3efab7d0695 100644
--- a/reactos/drivers/bus/acpi/resource/rsmemory.c
+++ b/reactos/drivers/bus/acpi/resource/rsmemory.c
@@ -29,8 +29,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsmemory")
diff --git a/reactos/drivers/bus/acpi/resource/rsmisc.c b/reactos/drivers/bus/acpi/resource/rsmisc.c
index 1bed2c14636..134ca94012b 100644
--- a/reactos/drivers/bus/acpi/resource/rsmisc.c
+++ b/reactos/drivers/bus/acpi/resource/rsmisc.c
@@ -31,8 +31,7 @@
  */
 
 
-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsmisc")
diff --git a/reactos/drivers/bus/acpi/resource/rsutils.c b/reactos/drivers/bus/acpi/resource/rsutils.c
index da4cafca999..a71b856d32a 100644
--- a/reactos/drivers/bus/acpi/resource/rsutils.c
+++ b/reactos/drivers/bus/acpi/resource/rsutils.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "acresrc.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsutils")
diff --git a/reactos/drivers/bus/acpi/resource/rsxface.c b/reactos/drivers/bus/acpi/resource/rsxface.c
index a1b250b499b..b19536e9a3b 100644
--- a/reactos/drivers/bus/acpi/resource/rsxface.c
+++ b/reactos/drivers/bus/acpi/resource/rsxface.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acresrc.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsxface")
diff --git a/reactos/drivers/bus/acpi/tables/tbconvrt.c b/reactos/drivers/bus/acpi/tables/tbconvrt.c
index a58e045502f..77ece2ae07a 100644
--- a/reactos/drivers/bus/acpi/tables/tbconvrt.c
+++ b/reactos/drivers/bus/acpi/tables/tbconvrt.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-#include "actbl.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbconvrt")
diff --git a/reactos/drivers/bus/acpi/tables/tbget.c b/reactos/drivers/bus/acpi/tables/tbget.c
index ef3875155cf..e16db9d26b3 100644
--- a/reactos/drivers/bus/acpi/tables/tbget.c
+++ b/reactos/drivers/bus/acpi/tables/tbget.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbget")
diff --git a/reactos/drivers/bus/acpi/tables/tbinstal.c b/reactos/drivers/bus/acpi/tables/tbinstal.c
index 00f10526f59..91c176f81a8 100644
--- a/reactos/drivers/bus/acpi/tables/tbinstal.c
+++ b/reactos/drivers/bus/acpi/tables/tbinstal.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbinstal")
diff --git a/reactos/drivers/bus/acpi/tables/tbutils.c b/reactos/drivers/bus/acpi/tables/tbutils.c
index de390305680..4d1cbbf3a2a 100644
--- a/reactos/drivers/bus/acpi/tables/tbutils.c
+++ b/reactos/drivers/bus/acpi/tables/tbutils.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "actables.h"
-#include "acinterp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbutils")
diff --git a/reactos/drivers/bus/acpi/tables/tbxface.c b/reactos/drivers/bus/acpi/tables/tbxface.c
index a02159cc836..ff44010c4df 100644
--- a/reactos/drivers/bus/acpi/tables/tbxface.c
+++ b/reactos/drivers/bus/acpi/tables/tbxface.c
@@ -25,11 +25,7 @@
  */
 
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "actables.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbxface")
diff --git a/reactos/drivers/bus/acpi/tables/tbxfroot.c b/reactos/drivers/bus/acpi/tables/tbxfroot.c
index b427eb71488..c15bf6d3a9c 100644
--- a/reactos/drivers/bus/acpi/tables/tbxfroot.c
+++ b/reactos/drivers/bus/acpi/tables/tbxfroot.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbxfroot")
diff --git a/reactos/drivers/bus/acpi/utils/cmalloc.c b/reactos/drivers/bus/acpi/utils/cmalloc.c
index 83a30806c92..03e743fb19d 100644
--- a/reactos/drivers/bus/acpi/utils/cmalloc.c
+++ b/reactos/drivers/bus/acpi/utils/cmalloc.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acglobal.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cmalloc")
diff --git a/reactos/drivers/bus/acpi/utils/cmclib.c b/reactos/drivers/bus/acpi/utils/cmclib.c
index 6b2d7246db6..29f1d4f6f7f 100644
--- a/reactos/drivers/bus/acpi/utils/cmclib.c
+++ b/reactos/drivers/bus/acpi/utils/cmclib.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acevents.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 /*
  * These implementations of standard C Library routines can optionally be
diff --git a/reactos/drivers/bus/acpi/utils/cmcopy.c b/reactos/drivers/bus/acpi/utils/cmcopy.c
index 004ce978f84..f09c35c7505 100644
--- a/reactos/drivers/bus/acpi/utils/cmcopy.c
+++ b/reactos/drivers/bus/acpi/utils/cmcopy.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/reactos/drivers/bus/acpi/utils/cmdebug.c b/reactos/drivers/bus/acpi/utils/cmdebug.c
index 7aeb524bbcc..afcb0ece698 100644
--- a/reactos/drivers/bus/acpi/utils/cmdebug.c
+++ b/reactos/drivers/bus/acpi/utils/cmdebug.c
@@ -24,7 +24,7 @@
  */
 
 
-#include "acpi.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cmdebug")
diff --git a/reactos/drivers/bus/acpi/utils/cmdelete.c b/reactos/drivers/bus/acpi/utils/cmdelete.c
index 22fc15028b7..a0fc962944a 100644
--- a/reactos/drivers/bus/acpi/utils/cmdelete.c
+++ b/reactos/drivers/bus/acpi/utils/cmdelete.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acparser.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cmdelete")
diff --git a/reactos/drivers/bus/acpi/utils/cmeval.c b/reactos/drivers/bus/acpi/utils/cmeval.c
index 510dff31ac1..0ad04066dd0 100644
--- a/reactos/drivers/bus/acpi/utils/cmeval.c
+++ b/reactos/drivers/bus/acpi/utils/cmeval.c
@@ -24,10 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cmeval")
diff --git a/reactos/drivers/bus/acpi/utils/cmglobal.c b/reactos/drivers/bus/acpi/utils/cmglobal.c
index c2d1237fef5..a66677ea394 100644
--- a/reactos/drivers/bus/acpi/utils/cmglobal.c
+++ b/reactos/drivers/bus/acpi/utils/cmglobal.c
@@ -23,13 +23,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define DEFINE_ACPI_GLOBALS
-
-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_UTILITIES
@@ -186,6 +180,97 @@ ACPI_TABLE_SUPPORT          acpi_gbl_acpi_table_data[NUM_ACPI_TABLES] =
 	/* XSDT 6 */ {XSDT_SIG,  XSDT_SIG, sizeof (RSDT_SIG)-1, ACPI_TABLE_SINGLE,   AE_OK,      NULL},
 };
 
+/*
+ * String versions of the exception codes above
+ * These strings must match the corresponding defines exactly
+ */
+NATIVE_CHAR          *acpi_gbl_exception_names_env[] =
+{
+	"AE_OK",
+	"AE_ERROR",
+	"AE_NO_ACPI_TABLES",
+	"AE_NO_NAMESPACE",
+	"AE_NO_MEMORY",
+	"AE_NOT_FOUND",
+	"AE_NOT_EXIST",
+	"AE_EXIST",
+	"AE_TYPE",
+	"AE_NULL_OBJECT",
+	"AE_NULL_ENTRY",
+	"AE_BUFFER_OVERFLOW",
+	"AE_STACK_OVERFLOW",
+	"AE_STACK_UNDERFLOW",
+	"AE_NOT_IMPLEMENTED",
+	"AE_VERSION_MISMATCH",
+	"AE_SUPPORT",
+	"AE_SHARE",
+	"AE_LIMIT",
+	"AE_TIME",
+	"AE_UNKNOWN_STATUS",
+	"AE_ACQUIRE_DEADLOCK",
+	"AE_RELEASE_DEADLOCK",
+	"AE_NOT_ACQUIRED",
+	"AE_ALREADY_ACQUIRED",
+	"AE_NO_HARDWARE_RESPONSE",
+	"AE_NO_GLOBAL_LOCK",
+};
+
+static NATIVE_CHAR          *acpi_gbl_exception_names_pgm[] =
+{
+	"AE_BAD_PARAMETER",
+	"AE_BAD_CHARACTER",
+	"AE_BAD_PATHNAME",
+	"AE_BAD_DATA",
+	"AE_BAD_ADDRESS",
+};
+
+static NATIVE_CHAR          *acpi_gbl_exception_names_tbl[] =
+{
+	"AE_BAD_SIGNATURE",
+	"AE_BAD_HEADER",
+	"AE_BAD_CHECKSUM",
+	"AE_BAD_VALUE",
+};
+
+static NATIVE_CHAR          *acpi_gbl_exception_names_aml[] =
+{
+	"AE_AML_ERROR",
+	"AE_AML_PARSE",
+	"AE_AML_BAD_OPCODE",
+	"AE_AML_NO_OPERAND",
+	"AE_AML_OPERAND_TYPE",
+	"AE_AML_OPERAND_VALUE",
+	"AE_AML_UNINITIALIZED_LOCAL",
+	"AE_AML_UNINITIALIZED_ARG",
+	"AE_AML_UNINITIALIZED_ELEMENT",
+	"AE_AML_NUMERIC_OVERFLOW",
+	"AE_AML_REGION_LIMIT",
+	"AE_AML_BUFFER_LIMIT",
+	"AE_AML_PACKAGE_LIMIT",
+	"AE_AML_DIVIDE_BY_ZERO",
+	"AE_AML_BAD_NAME",
+	"AE_AML_NAME_NOT_FOUND",
+	"AE_AML_INTERNAL",
+	"AE_AML_INVALID_SPACE_ID",
+	"AE_AML_STRING_LIMIT",
+	"AE_AML_NO_RETURN_VALUE",
+	"AE_AML_METHOD_LIMIT",
+	"AE_AML_NOT_OWNER",
+	"AE_AML_MUTEX_ORDER",
+	"AE_AML_MUTEX_NOT_ACQUIRED",
+};
+
+static NATIVE_CHAR          *acpi_gbl_exception_names_ctrl[] =
+{
+	"AE_CTRL_RETURN_VALUE",
+	"AE_CTRL_PENDING",
+	"AE_CTRL_TERMINATE",
+	"AE_CTRL_TRUE",
+	"AE_CTRL_FALSE",
+	"AE_CTRL_DEPTH",
+	"AE_CTRL_END",
+	"AE_CTRL_TRANSFER",
+};
 
 /*****************************************************************************
  *
diff --git a/reactos/drivers/bus/acpi/utils/cminit.c b/reactos/drivers/bus/acpi/utils/cminit.c
index 6c4c5d7c11e..72708c615d6 100644
--- a/reactos/drivers/bus/acpi/utils/cminit.c
+++ b/reactos/drivers/bus/acpi/utils/cminit.c
@@ -24,12 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "acparser.h"
-#include "acdispat.h"
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cminit")
diff --git a/reactos/drivers/bus/acpi/utils/cmobject.c b/reactos/drivers/bus/acpi/utils/cmobject.c
index 12048cb2730..cab18b546a4 100644
--- a/reactos/drivers/bus/acpi/utils/cmobject.c
+++ b/reactos/drivers/bus/acpi/utils/cmobject.c
@@ -24,11 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "amlcode.h"
+#include <acpi.h>
 
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/reactos/drivers/bus/acpi/utils/cmutils.c b/reactos/drivers/bus/acpi/utils/cmutils.c
index 357ef544506..387c64909b3 100644
--- a/reactos/drivers/bus/acpi/utils/cmutils.c
+++ b/reactos/drivers/bus/acpi/utils/cmutils.c
@@ -24,14 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acevents.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acdebug.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cmutils")
diff --git a/reactos/drivers/bus/acpi/utils/cmxface.c b/reactos/drivers/bus/acpi/utils/cmxface.c
index 0c2bd1b65a9..ce5124b487d 100644
--- a/reactos/drivers/bus/acpi/utils/cmxface.c
+++ b/reactos/drivers/bus/acpi/utils/cmxface.c
@@ -24,14 +24,7 @@
  */
 
 
-#include "acpi.h"
-#include "acevents.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acdebug.h"
-
+#include <acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 	 MODULE_NAME         ("cmxface")