diff --git a/reactos/drivers/input/i8042prt/i8042prt.c b/reactos/drivers/input/i8042prt/i8042prt.c
index 48fbda3e54a..6bbd1b4a348 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.c
+++ b/reactos/drivers/input/i8042prt/i8042prt.c
@@ -10,11 +10,13 @@
 
 /* INCLUDES ****************************************************************/
 
-#define NDEBUG
-#include <debug.h>
-
 #include "i8042prt.h"
 
+#ifndef NDEBUG
+#define NDEBUG
+#endif
+#include <debug.h>
+
 /* GLOBALS *******************************************************************/
 
 /*
diff --git a/reactos/drivers/input/i8042prt/i8042prt.h b/reactos/drivers/input/i8042prt/i8042prt.h
index 9abf7a91883..cdea07e4224 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.h
+++ b/reactos/drivers/input/i8042prt/i8042prt.h
@@ -320,6 +320,7 @@ NTSTATUS STDCALL I8042SynchWritePortKbd(PVOID Context,
                                         UCHAR Value,
                                         BOOLEAN WaitForAck);
 
+KSERVICE_ROUTINE I8042InterruptServiceKbd;
 BOOLEAN STDCALL I8042InterruptServiceKbd(struct _KINTERRUPT *Interrupt,
                                          VOID * Context);
 
@@ -354,6 +355,7 @@ VOID STDCALL I8042DpcRoutineMouseTimeout(PKDPC Dpc,
                                          PVOID SystemArgument1,
                                          PVOID SystemArgument2);
 
+KSERVICE_ROUTINE I8042InterruptServiceMouse;
 BOOLEAN STDCALL I8042InterruptServiceMouse(struct _KINTERRUPT *Interrupt,
                                            VOID *Context);
 
diff --git a/reactos/drivers/input/i8042prt/keyboard.c b/reactos/drivers/input/i8042prt/keyboard.c
index f422a7736b0..452471bc85f 100644
--- a/reactos/drivers/input/i8042prt/keyboard.c
+++ b/reactos/drivers/input/i8042prt/keyboard.c
@@ -12,9 +12,14 @@
 /* INCLUDES ****************************************************************/
 
 #include "i8042prt.h"
-#include "kdfuncs.h"
 
+#ifdef __REACTOS__
+#include "kdfuncs.h"
+#endif
+
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 /* GLOBALS *******************************************************************/
diff --git a/reactos/drivers/input/i8042prt/mouse.c b/reactos/drivers/input/i8042prt/mouse.c
index d213253c7b7..7fdf21bc632 100644
--- a/reactos/drivers/input/i8042prt/mouse.c
+++ b/reactos/drivers/input/i8042prt/mouse.c
@@ -13,7 +13,9 @@
 
 #include "i8042prt.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 /*
diff --git a/reactos/drivers/input/i8042prt/ps2pp.c b/reactos/drivers/input/i8042prt/ps2pp.c
index 3b183ec8617..44db6ff4ef2 100644
--- a/reactos/drivers/input/i8042prt/ps2pp.c
+++ b/reactos/drivers/input/i8042prt/ps2pp.c
@@ -9,14 +9,13 @@
 
 /* INCLUDES ****************************************************************/
 
+#include "i8042prt.h"
+
 #ifndef NDEBUG
 #define NDEBUG
 #endif
 #include <debug.h>
 
-#include "i8042prt.h"
-
-
 VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, UCHAR Input)
 {
 	UCHAR PktType;
diff --git a/reactos/drivers/input/i8042prt/registry.c b/reactos/drivers/input/i8042prt/registry.c
index 8c25872cd31..2e532dd1615 100644
--- a/reactos/drivers/input/i8042prt/registry.c
+++ b/reactos/drivers/input/i8042prt/registry.c
@@ -11,13 +11,13 @@
 
 /* INCLUDES ****************************************************************/
 
+#include "i8042prt.h"
+
 #ifndef NDEBUG
 #define NDEBUG
 #endif
 #include <debug.h>
 
-#include "i8042prt.h"
-
 /* FUNCTIONS *****************************************************************/
 
 /*