Index: kernel/generic/include/adt/bitmap.h
===================================================================
--- kernel/generic/include/adt/bitmap.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/adt/bitmap.h	(revision 3bf41438f48cc6db2fe1c247261beb4057bb9725)
@@ -37,5 +37,4 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 
 #define BITS2BYTES(bits)	(bits ? ((((bits)-1)>>3)+1) : 0)
Index: kernel/generic/include/adt/btree.h
===================================================================
--- kernel/generic/include/adt/btree.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/adt/btree.h	(revision 3bf41438f48cc6db2fe1c247261beb4057bb9725)
@@ -37,5 +37,4 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 #include <adt/list.h>
 
@@ -46,5 +45,5 @@
 
 /** B-tree node structure. */
-struct btree_node {
+typedef struct btree_node {
 	/** Number of keys. */
 	count_t keys;
@@ -66,8 +65,8 @@
 	 * There is room for storing a subtree pointer for the extra key.
 	 */
-	btree_node_t *subtree[BTREE_M + 1];
+	struct btree_node *subtree[BTREE_M + 1];
 
 	/** Pointer to parent node. Root node has NULL parent. */
-	btree_node_t *parent;
+	struct btree_node *parent;
 
 	/** Link connecting leaf-level nodes. Defined only when this node is a leaf. */
@@ -77,11 +76,11 @@
 	link_t bfs_link;
 	int depth;
-};
+} btree_node_t;
 
 /** B-tree structure. */
-struct btree {
+typedef struct {
 	btree_node_t *root;	/**< B-tree root node pointer. */
 	link_t leaf_head;	/**< Leaf-level list head. */
-};
+} btree_t;
 
 extern void btree_init(void);
Index: kernel/generic/include/adt/fifo.h
===================================================================
--- kernel/generic/include/adt/fifo.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/adt/fifo.h	(revision 3bf41438f48cc6db2fe1c247261beb4057bb9725)
@@ -46,5 +46,4 @@
 #define KERN_FIFO_H_
 
-#include <typedefs.h>
 #include <mm/slab.h>
 
Index: kernel/generic/include/adt/hash_table.h
===================================================================
--- kernel/generic/include/adt/hash_table.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/adt/hash_table.h	(revision 3bf41438f48cc6db2fe1c247261beb4057bb9725)
@@ -38,16 +38,7 @@
 #include <adt/list.h>
 #include <arch/types.h>
-#include <typedefs.h>
-
-/** Hash table structure. */
-struct hash_table {
-	link_t *entry;
-	count_t entries;
-	count_t max_keys;
-	hash_table_operations_t *op;
-};
 
 /** Set of operations for hash table. */
-struct hash_table_operations {
+typedef struct {
 	/** Hash function.
 	 *
@@ -71,5 +62,13 @@
 	 */
 	void (*remove_callback)(link_t *item);
-};
+} hash_table_operations_t;
+
+/** Hash table structure. */
+typedef struct {
+	link_t *entry;
+	count_t entries;
+	count_t max_keys;
+	hash_table_operations_t *op;
+} hash_table_t;
 
 #define hash_table_get_instance(item, type, member)	list_get_instance((item), type, member)
Index: kernel/generic/include/adt/list.h
===================================================================
--- kernel/generic/include/adt/list.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/adt/list.h	(revision 3bf41438f48cc6db2fe1c247261beb4057bb9725)
@@ -37,11 +37,10 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 
 /** Doubly linked list head and link type. */
-struct link {
-	link_t *prev;	/**< Pointer to the previous item in the list. */
-	link_t *next;	/**< Pointer to the next item in the list. */
-};
+typedef struct link {
+	struct link *prev;	/**< Pointer to the previous item in the list. */
+	struct link *next;	/**< Pointer to the next item in the list. */
+} link_t;
 
 /** Declare and initialize statically allocated list.