Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision c583970b702217433d88305959ef876e3c1707d0)
+++ kernel/generic/include/console/chardev.h	(revision 821cc933bb47a68b3a1cf7ff1f4725d46116f16e)
@@ -90,7 +90,10 @@
     indev_operations_t *op);
 extern void indev_push_character(indev_t *indev, wchar_t ch);
+extern wchar_t indev_pop_character(indev_t *indev);
 
 extern void outdev_initialize(char *name, outdev_t *outdev,
     outdev_operations_t *op);
+
+extern bool check_poll(indev_t *indev);
 
 #endif /* KERN_CHARDEV_H_ */
Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision c583970b702217433d88305959ef876e3c1707d0)
+++ kernel/generic/include/console/console.h	(revision 821cc933bb47a68b3a1cf7ff1f4725d46116f16e)
@@ -41,7 +41,7 @@
 extern indev_t *stdin;
 extern outdev_t *stdout;
-
 extern bool silent;
 
+extern indev_t *stdin_wire(void);
 extern void console_init(void);
 
@@ -49,7 +49,5 @@
 extern void klog_update(void);
 
-extern bool check_poll(indev_t *indev);
 extern wchar_t getc(indev_t *indev);
-extern wchar_t _getc(indev_t *indev);
 extern count_t gets(indev_t *indev, char *buf, size_t buflen);
 extern unative_t sys_klog(int fd, const void *buf, size_t size);