Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision 65ffec3538491cc19f0dceb8ff7901962adbc191)
+++ uspace/drv/char/i8042/i8042.c	(revision 9ff60d1d86dc713dd4c4af34e484c72b732d6621)
@@ -29,5 +29,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup kbd_port
  * @ingroup kbd
@@ -38,18 +37,14 @@
  */
 
-#include <ddi.h>
 #include <devman.h>
 #include <device/hw_res.h>
+#include <ddi.h>
 #include <libarch/ddi.h>
-#include <loc.h>
-#include <async.h>
-#include <unistd.h>
-#include <stdio.h>
 #include <errno.h>
 #include <str_error.h>
 #include <inttypes.h>
+
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
-
 #include <ops/char_dev.h>
 
Index: uspace/drv/char/i8042/i8042.h
===================================================================
--- uspace/drv/char/i8042/i8042.h	(revision 65ffec3538491cc19f0dceb8ff7901962adbc191)
+++ uspace/drv/char/i8042/i8042.h	(revision 9ff60d1d86dc713dd4c4af34e484c72b732d6621)
@@ -39,6 +39,4 @@
 
 #include <sys/types.h>
-#include <libarch/ddi.h>
-#include <async.h>
 #include <fibril_synch.h>
 #include <ddf/driver.h>