Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision 28a5ebdea900783081bd23e40f685b6b0479c63d)
+++ kernel/generic/include/console/chardev.h	(revision c0b54c9d6fa6bb96ee21171d5b8f0c3b58ed0e60)
@@ -39,5 +39,5 @@
 #include <stdbool.h>
 #include <stddef.h>
-#include <synch/waitq.h>
+#include <synch/semaphore.h>
 #include <synch/spinlock.h>
 
@@ -64,5 +64,5 @@
 typedef struct indev {
 	const char *name;
-	waitq_t wq;
+	semaphore_t wq;
 
 	/** Protects everything below. */