diff --git a/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt b/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt
index 7e7ddc582df..6354a66e014 100644
--- a/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt
+++ b/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})
diff --git a/reactos/drivers/bus/acpi/cmbatt/cmbatt.c b/reactos/drivers/bus/acpi/cmbatt/cmbatt.c
index 2e6f9bf2757..a9bddd4e603 100644
--- a/reactos/drivers/bus/acpi/cmbatt/cmbatt.c
+++ b/reactos/drivers/bus/acpi/cmbatt/cmbatt.c
@@ -10,6 +10,8 @@
 
 #include "cmbatt.h"
 
+#include <debug.h>
+
 /* GLOBALS ********************************************************************/
 
 ULONG CmBattDebug;
diff --git a/reactos/drivers/bus/acpi/cmbatt/cmbatt.h b/reactos/drivers/bus/acpi/cmbatt/cmbatt.h
index 8f952d20200..1d172795966 100644
--- a/reactos/drivers/bus/acpi/cmbatt/cmbatt.h
+++ b/reactos/drivers/bus/acpi/cmbatt/cmbatt.h
@@ -6,13 +6,10 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <ntddk.h>
-#include <initguid.h>
+#include <wdm.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 
diff --git a/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c b/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c
index 1bb01b63405..2a5a73f4603 100644
--- a/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c
+++ b/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c
@@ -10,6 +10,8 @@
 
 #include "cmbatt.h"
 
+#include <debug.h>
+
 /* GLOBALS ********************************************************************/
 
 WMIGUIDREGINFO CmBattWmiGuidList[1] =
diff --git a/reactos/drivers/bus/acpi/cmbatt/cmexec.c b/reactos/drivers/bus/acpi/cmbatt/cmexec.c
index beb646ab509..f808b5d4c0f 100644
--- a/reactos/drivers/bus/acpi/cmbatt/cmexec.c
+++ b/reactos/drivers/bus/acpi/cmbatt/cmexec.c
@@ -10,6 +10,9 @@
 
 #include "cmbatt.h"
 
+#include <acpiioct.h>
+#include <debug.h>
+
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/bus/acpi/cmbatt/guid.c b/reactos/drivers/bus/acpi/cmbatt/guid.c
new file mode 100644
index 00000000000..3f4468bf330
--- /dev/null
+++ b/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 */