Index: kernel/genarch/src/kbd/key.c
===================================================================
--- kernel/genarch/src/kbd/key.c	(revision d46c6ecd4bb1934b64d8c11726ffed69e5897343)
+++ kernel/genarch/src/kbd/key.c	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
@@ -37,5 +37,10 @@
 #include <genarch/kbd/key.h>
 #include <genarch/kbd/scanc.h>
+#ifdef CONFIG_I8042
 #include <genarch/kbd/scanc_pc.h>
+#endif
+#if (defined(CONFIG_Z8530) || defined(CONFIG_NS16550))
+#include <genarch/kbd/scanc_sun.h>
+#endif
 #include <synch/spinlock.h>
 #include <console/chardev.h>