Index: kernel/generic/include/adt/bitmap.h
===================================================================
--- kernel/generic/include/adt/bitmap.h	(revision 46321fbe357afbfd389f20878e8cda76c62f0444)
+++ kernel/generic/include/adt/bitmap.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -42,16 +42,17 @@
 typedef struct {
 	uint8_t *map;
-	count_t bits;
+	size_t bits;
 } bitmap_t;
 
-extern void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, count_t bits);
-extern void bitmap_set_range(bitmap_t *bitmap, index_t start, count_t bits);
-extern void bitmap_clear_range(bitmap_t *bitmap, index_t start, count_t bits);
-extern void bitmap_copy(bitmap_t *dst, bitmap_t *src, count_t bits);
+extern void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, size_t bits);
+extern void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits);
+extern void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits);
+extern void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t bits);
 
-static inline int bitmap_get(bitmap_t *bitmap,index_t bit)
+static inline int bitmap_get(bitmap_t *bitmap, size_t bit)
 {
 	if(bit >= bitmap->bits)
 		return 0;
+	
 	return !! ((bitmap->map)[bit/8] & (1 << (bit & 7)));
 }
Index: kernel/generic/include/adt/btree.h
===================================================================
--- kernel/generic/include/adt/btree.h	(revision 46321fbe357afbfd389f20878e8cda76c62f0444)
+++ kernel/generic/include/adt/btree.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -47,5 +47,5 @@
 typedef struct btree_node {
 	/** Number of keys. */
-	count_t keys;
+	size_t keys;
 
 	/**
Index: kernel/generic/include/adt/fifo.h
===================================================================
--- kernel/generic/include/adt/fifo.h	(revision 46321fbe357afbfd389f20878e8cda76c62f0444)
+++ kernel/generic/include/adt/fifo.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -60,7 +60,7 @@
 	struct {					\
 		t fifo[(itms)];				\
-		count_t items;				\
-		index_t head;				\
-		index_t tail;				\
+		size_t items;				\
+		size_t head;				\
+		size_t tail;				\
 	} name = {					\
 		.items = (itms),			\
@@ -81,7 +81,7 @@
 	struct {					\
 		t *fifo;				\
-		count_t items;				\
-		index_t head;				\
-		index_t tail;				\
+		size_t items;				\
+		size_t head;				\
+		size_t tail;				\
 	} name = {					\
 		.fifo = NULL,				\
Index: kernel/generic/include/adt/hash_table.h
===================================================================
--- kernel/generic/include/adt/hash_table.h	(revision 46321fbe357afbfd389f20878e8cda76c62f0444)
+++ kernel/generic/include/adt/hash_table.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -48,5 +48,5 @@
 	 * @return Index into hash table.
 	 */
-	index_t (* hash)(unative_t key[]);
+	size_t (* hash)(unative_t key[]);
 	
 	/** Hash table item comparison function.
@@ -57,5 +57,5 @@
 	 * @return true if the keys match, false otherwise.
 	 */
-	bool (*compare)(unative_t key[], count_t keys, link_t *item);
+	bool (*compare)(unative_t key[], size_t keys, link_t *item);
 
 	/** Hash table item removal callback.
@@ -69,6 +69,6 @@
 typedef struct {
 	link_t *entry;
-	count_t entries;
-	count_t max_keys;
+	size_t entries;
+	size_t max_keys;
 	hash_table_operations_t *op;
 } hash_table_t;
@@ -77,9 +77,9 @@
 	list_get_instance((item), type, member)
 
-extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys,
+extern void hash_table_create(hash_table_t *h, size_t m, size_t max_keys,
     hash_table_operations_t *op);
 extern void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item);
 extern link_t *hash_table_find(hash_table_t *h, unative_t key[]);
-extern void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys);
+extern void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys);
 
 #endif