[COMPBATT]

* 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=61855

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

@@ -3,6 +3,7 @@ list(APPEND SOURCE
     compbatt.c
     compmisc.c
     comppnp.c
+    guid.c
     compbatt.rc)
 
 add_library(compbatt SHARED ${SOURCE})

reactos/drivers/bus/acpi/compbatt/compbatt.c

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

reactos/drivers/bus/acpi/compbatt/compbatt.h

@@ -6,11 +6,8 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <ntddk.h>
+#include <wdm.h>
-#include <initguid.h>
 #include <batclass.h>
-#include <debug.h>
-#include <wdmguid.h>
 
 #define COMPBATT_BATTERY_INFORMATION_PRESENT    0x04
 #define COMPBATT_TAG_ASSIGNED                   0x80

reactos/drivers/bus/acpi/compbatt/comppnp.c

@@ -10,6 +10,8 @@
 
 #include "compbatt.h"
 
+#include <wdmguid.h>
+
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS

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

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