diff --git a/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt b/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt
index b61bc216c40..8923c64c67d 100644
--- a/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt
+++ b/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})
diff --git a/reactos/drivers/bus/acpi/compbatt/compbatt.c b/reactos/drivers/bus/acpi/compbatt/compbatt.c
index 1630d2f84b3..c22f4c720ce 100644
--- a/reactos/drivers/bus/acpi/compbatt/compbatt.c
+++ b/reactos/drivers/bus/acpi/compbatt/compbatt.c
@@ -10,6 +10,8 @@
 
 #include "compbatt.h"
 
+#include <debug.h>
+
 /* GLOBALS ********************************************************************/
 
 ULONG CompBattDebug;
diff --git a/reactos/drivers/bus/acpi/compbatt/compbatt.h b/reactos/drivers/bus/acpi/compbatt/compbatt.h
index 792b893573e..7bb4efdd391 100644
--- a/reactos/drivers/bus/acpi/compbatt/compbatt.h
+++ b/reactos/drivers/bus/acpi/compbatt/compbatt.h
@@ -6,11 +6,8 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <ntddk.h>
-#include <initguid.h>
+#include <wdm.h>
 #include <batclass.h>
-#include <debug.h>
-#include <wdmguid.h>
 
 #define COMPBATT_BATTERY_INFORMATION_PRESENT    0x04
 #define COMPBATT_TAG_ASSIGNED                   0x80
diff --git a/reactos/drivers/bus/acpi/compbatt/comppnp.c b/reactos/drivers/bus/acpi/compbatt/comppnp.c
index 4e32b147bd5..5966cda4826 100644
--- a/reactos/drivers/bus/acpi/compbatt/comppnp.c
+++ b/reactos/drivers/bus/acpi/compbatt/comppnp.c
@@ -10,6 +10,8 @@
 
 #include "compbatt.h"
 
+#include <wdmguid.h>
+
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/bus/acpi/compbatt/guid.c b/reactos/drivers/bus/acpi/compbatt/guid.c
new file mode 100644
index 00000000000..fde0eaaa18f
--- /dev/null
+++ b/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 */