diff --git a/reactos/drivers/input/i8042prt/createclose.c b/reactos/drivers/input/i8042prt/createclose.c
index 2cffd362607..b2497bef350 100644
--- a/reactos/drivers/input/i8042prt/createclose.c
+++ b/reactos/drivers/input/i8042prt/createclose.c
@@ -10,6 +10,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS NTAPI
diff --git a/reactos/drivers/input/i8042prt/i8042prt.c b/reactos/drivers/input/i8042prt/i8042prt.c
index 5f3eb337071..d9c792b2d90 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.c
+++ b/reactos/drivers/input/i8042prt/i8042prt.c
@@ -13,6 +13,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 static DRIVER_STARTIO i8042StartIo;
diff --git a/reactos/drivers/input/i8042prt/i8042prt.h b/reactos/drivers/input/i8042prt/i8042prt.h
index 8001d431101..8cbe739afb6 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.h
+++ b/reactos/drivers/input/i8042prt/i8042prt.h
@@ -1,3 +1,5 @@
+#ifndef _I8042PRT_PCH_
+#define _I8042PRT_PCH_
 
 #include <ntifs.h>
 #include <kbdmou.h>
@@ -6,7 +8,6 @@
 #include <bugcodes.h>
 #include <poclass.h>
 #include <kdfuncs.h>
-#include <debug.h>
 
 /*-----------------------------------------------------
  * Structures
@@ -439,3 +440,5 @@ NTSTATUS
 ReadRegistryEntries(
 	IN PUNICODE_STRING RegistryPath,
 	OUT PI8042_SETTINGS Settings);
+
+#endif /* _I8042PRT_PCH_ */
diff --git a/reactos/drivers/input/i8042prt/keyboard.c b/reactos/drivers/input/i8042prt/keyboard.c
index 26a6f7b1240..209836ade15 100644
--- a/reactos/drivers/input/i8042prt/keyboard.c
+++ b/reactos/drivers/input/i8042prt/keyboard.c
@@ -13,6 +13,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* GLOBALS *******************************************************************/
 
 static IO_WORKITEM_ROUTINE i8042PowerWorkItem;
diff --git a/reactos/drivers/input/i8042prt/misc.c b/reactos/drivers/input/i8042prt/misc.c
index 31d754d63d4..64f67c133ca 100644
--- a/reactos/drivers/input/i8042prt/misc.c
+++ b/reactos/drivers/input/i8042prt/misc.c
@@ -10,6 +10,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
diff --git a/reactos/drivers/input/i8042prt/mouse.c b/reactos/drivers/input/i8042prt/mouse.c
index ee8d503b87a..d6e224a4c59 100644
--- a/reactos/drivers/input/i8042prt/mouse.c
+++ b/reactos/drivers/input/i8042prt/mouse.c
@@ -14,6 +14,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/drivers/input/i8042prt/pnp.c b/reactos/drivers/input/i8042prt/pnp.c
index 184d1a3919e..3d707850b46 100644
--- a/reactos/drivers/input/i8042prt/pnp.c
+++ b/reactos/drivers/input/i8042prt/pnp.c
@@ -11,6 +11,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 /* This is all pretty confusing. There's more than one way to
diff --git a/reactos/drivers/input/i8042prt/ps2pp.c b/reactos/drivers/input/i8042prt/ps2pp.c
index bab65b315ed..ea23af634c5 100644
--- a/reactos/drivers/input/i8042prt/ps2pp.c
+++ b/reactos/drivers/input/i8042prt/ps2pp.c
@@ -11,6 +11,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 VOID
diff --git a/reactos/drivers/input/i8042prt/readwrite.c b/reactos/drivers/input/i8042prt/readwrite.c
index 1ef84da1aed..6fbd6fb0624 100644
--- a/reactos/drivers/input/i8042prt/readwrite.c
+++ b/reactos/drivers/input/i8042prt/readwrite.c
@@ -13,6 +13,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 VOID
diff --git a/reactos/drivers/input/i8042prt/registry.c b/reactos/drivers/input/i8042prt/registry.c
index 38b0f055e99..48b6ebfd234 100644
--- a/reactos/drivers/input/i8042prt/registry.c
+++ b/reactos/drivers/input/i8042prt/registry.c
@@ -13,6 +13,8 @@
 
 #include "i8042prt.h"
 
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS