Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision b006a2c8990750690f6845007fe696ea0c726deb)
+++ kernel/arch/ia32/Makefile.inc	(revision d46c6ecd4bb1934b64d8c11726ffed69e5897343)
@@ -81,6 +81,4 @@
 
 CONFIG_I8042 = y
-CONFIG_I8042_PC = y
-DEFS += -DCONFIG_I8042_PC
 
 ## Accepted configuration directives
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision b006a2c8990750690f6845007fe696ea0c726deb)
+++ kernel/arch/ia32/src/ia32.c	(revision d46c6ecd4bb1934b64d8c11726ffed69e5897343)
@@ -42,5 +42,5 @@
 #include <arch/drivers/ega.h>
 #include <arch/drivers/vesa.h>
-#include <genarch/i8042/i8042.h>
+#include <genarch/kbd/i8042.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>