Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/console/chardev.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
@@ -36,5 +36,4 @@
 #define KERN_CHARDEV_H_
 
-#include <typedefs.h>
 #include <arch/types.h>
 #include <synch/waitq.h>
@@ -43,17 +42,17 @@
 #define CHARDEV_BUFLEN 512
 
+struct chardev;
+
 /* Character device operations interface. */
-struct chardev_operations {
-	void (* suspend)(chardev_t *);		/**< Suspend pushing characters. */
-	void (* resume)(chardev_t *); 		/**< Resume pushing characters. */
-	void (* write)(chardev_t *, char c);	/**< Write character to stream. */
+typedef struct {
+	void (* suspend)(struct chardev *);		/**< Suspend pushing characters. */
+	void (* resume)(struct chardev *); 		/**< Resume pushing characters. */
+	void (* write)(struct chardev *, char c);	/**< Write character to stream. */
 	/** Read character directly from device, assume interrupts disabled */
-	char (* read)(chardev_t *); 
-};
-
-typedef struct chardev_operations chardev_operations_t;
+	char (* read)(struct chardev *); 
+} chardev_operations_t;
 
 /** Character input device. */
-struct chardev {
+typedef struct chardev {
 	char *name;
 	
@@ -65,5 +64,5 @@
 	index_t index;
 	void *data;
-};
+} chardev_t;
 
 extern void chardev_initialize(char *name,
Index: kernel/generic/include/console/cmd.h
===================================================================
--- kernel/generic/include/console/cmd.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/console/cmd.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
@@ -36,5 +36,5 @@
 #define KERN_CMD_H_
 
-#include <typedefs.h>
+#include <console/kconsole.h>
 
 extern void cmd_initialize(cmd_info_t *cmd);
Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/console/console.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
@@ -37,5 +37,5 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
+#include <console/chardev.h>
 
 extern chardev_t *stdin;
Index: kernel/generic/include/console/kconsole.h
===================================================================
--- kernel/generic/include/console/kconsole.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/console/kconsole.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
@@ -36,5 +36,4 @@
 #define KERN_KCONSOLE_H_
 
-#include <typedefs.h>
 #include <adt/list.h>
 #include <synch/spinlock.h>
@@ -43,13 +42,13 @@
 #define KCONSOLE_HISTORY 10
 
-enum cmd_arg_type {
+typedef enum {
 	ARG_TYPE_INVALID = 0,
 	ARG_TYPE_INT,
 	ARG_TYPE_STRING,
 	ARG_TYPE_VAR      /**< Variable type - either symbol or string */
-};
+} cmd_arg_type_t;
 
 /** Structure representing one argument of kconsole command line. */
-struct cmd_arg {
+typedef struct {
 	cmd_arg_type_t type;		/**< Type descriptor. */
 	void *buffer;			/**< Buffer where to store data. */
@@ -57,8 +56,8 @@
 	unative_t intval;                /**< Integer value */
 	cmd_arg_type_t vartype;         /**< Resulting type of variable arg */
-};
+} cmd_arg_t;
 
 /** Structure representing one kconsole command. */
-struct cmd_info {
+typedef struct {
 	link_t link;			/**< Command list link. */
 	SPINLOCK_DECLARE(lock);		/**< This lock protects everything below. */
@@ -69,5 +68,5 @@
 	cmd_arg_t *argv;		/**< Argument vector. */
 	void (* help)(void);		/**< Function for printing detailed help. */
-};
+} cmd_info_t;
 
 extern spinlock_t cmd_lock;