[CMBATT]

* Do not include debug.h from within the main header.
* Improve the GUIDs situation.
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61854

reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt

@@ -4,6 +4,7 @@ list(APPEND SOURCE
     cmexec.c
     cmbpnp.c
     cmbwmi.c
+    guid.c
     cmbatt.rc)
 
 add_library(cmbatt SHARED ${SOURCE})

reactos/drivers/bus/acpi/cmbatt/cmbatt.c

@@ -10,6 +10,8 @@
 
 #include "cmbatt.h"
 
+#include <debug.h>
+
 /* GLOBALS ********************************************************************/
 
 ULONG CmBattDebug;

reactos/drivers/bus/acpi/cmbatt/cmbatt.h

@@ -6,13 +6,10 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <ntddk.h>
+#include <wdm.h>
-#include <initguid.h>
 #include <batclass.h>
-#include <acpiioct.h>
 #include <wmilib.h>
 #include <wdmguid.h>
-#include <debug.h>
 
 #define IOCTL_BATTERY_QUERY_UNIQUE_ID  \
     CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 

reactos/drivers/bus/acpi/cmbatt/cmbwmi.c

@@ -10,6 +10,8 @@
 
 #include "cmbatt.h"
 
+#include <debug.h>
+
 /* GLOBALS ********************************************************************/
 
 WMIGUIDREGINFO CmBattWmiGuidList[1] =

reactos/drivers/bus/acpi/cmbatt/cmexec.c

@@ -10,6 +10,9 @@
 
 #include "cmbatt.h"
 
+#include <acpiioct.h>
+#include <debug.h>
+
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS

reactos/drivers/bus/acpi/cmbatt/guid.c

@@ -0,0 +1,6 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <wdmguid.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */