Index: kernel/generic/src/adt/bitmap.c
===================================================================
--- kernel/generic/src/adt/bitmap.c	(revision b014e9f8dfc796df22c985c021ea0869071a9d5a)
+++ kernel/generic/src/adt/bitmap.c	(revision bac82eebae5b85ba4fd0a1442b085cfb504958ee)
@@ -55,5 +55,5 @@
  * @param bits Number of bits stored in bitmap.
  */
-void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, count_t bits)
+void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, size_t bits)
 {
 	bitmap->map = map;
@@ -67,11 +67,11 @@
  * @param bits Number of bits to set.
  */
-void bitmap_set_range(bitmap_t *bitmap, index_t start, count_t bits)
+void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits)
 {
-	index_t i=0;
-	index_t aligned_start;
-	count_t lub;		/* leading unaligned bits */
-	count_t amb;		/* aligned middle bits */
-	count_t tab;		/* trailing aligned bits */
+	size_t i = 0;
+	size_t aligned_start;
+	size_t lub;		/* leading unaligned bits */
+	size_t amb;		/* aligned middle bits */
+	size_t tab;		/* trailing aligned bits */
 	
 	ASSERT(start + bits <= bitmap->bits);
@@ -117,11 +117,11 @@
  * @param bits Number of bits to clear.
  */
-void bitmap_clear_range(bitmap_t *bitmap, index_t start, count_t bits)
+void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits)
 {
-	index_t i=0;
-	index_t aligned_start;
-	count_t lub;		/* leading unaligned bits */
-	count_t amb;		/* aligned middle bits */
-	count_t tab;		/* trailing aligned bits */
+	size_t i = 0;
+	size_t aligned_start;
+	size_t lub;		/* leading unaligned bits */
+	size_t amb;		/* aligned middle bits */
+	size_t tab;		/* trailing aligned bits */
 	
 	ASSERT(start + bits <= bitmap->bits);
@@ -169,7 +169,7 @@
  * @param bits Number of bits to copy.
  */
-void bitmap_copy(bitmap_t *dst, bitmap_t *src, count_t bits)
+void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t bits)
 {
-	index_t i;
+	size_t i;
 	
 	ASSERT(bits <= dst->bits);
Index: kernel/generic/src/adt/btree.c
===================================================================
--- kernel/generic/src/adt/btree.c	(revision b014e9f8dfc796df22c985c021ea0869071a9d5a)
+++ kernel/generic/src/adt/btree.c	(revision bac82eebae5b85ba4fd0a1442b085cfb504958ee)
@@ -64,7 +64,7 @@
 static btree_node_t *node_split(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree, btree_key_t *median);
 static btree_node_t *node_combine(btree_node_t *node);
-static index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right);
-static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, index_t idx);
-static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, index_t idx);
+static size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right);
+static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx);
+static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx);
 static bool try_insert_by_rotation_to_left(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree);
 static bool try_insert_by_rotation_to_right(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree);
@@ -138,5 +138,5 @@
 void btree_destroy_subtree(btree_node_t *root)
 {
-	count_t i;
+	size_t i;
 
 	if (root->keys) {
@@ -270,5 +270,5 @@
 	
 	if (node->keys > FILL_FACTOR) {
-		count_t i;
+		size_t i;
 
 		/*
@@ -286,5 +286,5 @@
 		
 	} else {
-		index_t idx;
+		size_t idx;
 		btree_node_t *rnode, *parent;
 
@@ -336,5 +336,5 @@
 		} else {
 			void *val;
-			count_t i;
+			size_t i;
 		
 			/*
@@ -443,9 +443,9 @@
 void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *lsubtree)
 {
-	count_t i;
+	size_t i;
 
 	for (i = 0; i < node->keys; i++) {
 		if (key < node->key[i]) {
-			count_t j;
+			size_t j;
 		
 			for (j = node->keys; j > i; j--) {
@@ -479,9 +479,9 @@
 void node_insert_key_and_rsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree)
 {
-	count_t i;
+	size_t i;
 
 	for (i = 0; i < node->keys; i++) {
 		if (key < node->key[i]) {
-			count_t j;
+			size_t j;
 		
 			for (j = node->keys; j > i; j--) {
@@ -511,5 +511,5 @@
 void node_remove_key_and_lsubtree(btree_node_t *node, btree_key_t key)
 {
-	count_t i, j;
+	size_t i, j;
 	
 	for (i = 0; i < node->keys; i++) {
@@ -539,5 +539,5 @@
 void node_remove_key_and_rsubtree(btree_node_t *node, btree_key_t key)
 {
-	count_t i, j;
+	size_t i, j;
 	
 	for (i = 0; i < node->keys; i++) {
@@ -577,5 +577,5 @@
 {
 	btree_node_t *rnode;
-	count_t i, j;
+	size_t i, j;
 
 	ASSERT(median);
@@ -604,5 +604,5 @@
 	 * If this is an index node, do not copy the median.
 	 */
-	i = (count_t) INDEX_NODE(node);
+	i = (size_t) INDEX_NODE(node);
 	for (i += MEDIAN_HIGH_INDEX(node), j = 0; i < node->keys; i++, j++) {
 		rnode->key[j] = node->key[i];
@@ -637,7 +637,7 @@
 btree_node_t *node_combine(btree_node_t *node)
 {
-	index_t idx;
+	size_t idx;
 	btree_node_t *rnode;
-	count_t i;
+	size_t i;
 
 	ASSERT(!ROOT_NODE(node));
@@ -686,7 +686,7 @@
  * @return Index of the key associated with the subtree.
  */ 
-index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
-{
-	count_t i;
+size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
+{
+	size_t i;
 	
 	for (i = 0; i < node->keys + 1; i++) {
@@ -707,5 +707,5 @@
  * @param idx Index of the parent node key that is taking part in the rotation.
  */
-void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, index_t idx)
+void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
 {
 	btree_key_t key;
@@ -744,5 +744,5 @@
  * @param idx Index of the parent node key that is taking part in the rotation.
  */
-void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, index_t idx)
+void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
 {
 	btree_key_t key;
@@ -787,5 +787,5 @@
 bool try_insert_by_rotation_to_left(btree_node_t *node, btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
 {
-	index_t idx;
+	size_t idx;
 	btree_node_t *lnode;
 
@@ -834,5 +834,5 @@
 bool try_insert_by_rotation_to_right(btree_node_t *node, btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
 {
-	index_t idx;
+	size_t idx;
 	btree_node_t *rnode;
 
@@ -873,5 +873,5 @@
 bool try_rotation_from_left(btree_node_t *rnode)
 {
-	index_t idx;
+	size_t idx;
 	btree_node_t *lnode;
 
@@ -908,5 +908,5 @@
 bool try_rotation_from_right(btree_node_t *lnode)
 {
-	index_t idx;
+	size_t idx;
 	btree_node_t *rnode;
 
@@ -941,5 +941,5 @@
 void btree_print(btree_t *t)
 {
-	count_t i;
+	size_t i;
 	int depth = t->root->depth;
 	link_t head, *cur;
Index: kernel/generic/src/adt/hash_table.c
===================================================================
--- kernel/generic/src/adt/hash_table.c	(revision b014e9f8dfc796df22c985c021ea0869071a9d5a)
+++ kernel/generic/src/adt/hash_table.c	(revision bac82eebae5b85ba4fd0a1442b085cfb504958ee)
@@ -52,7 +52,7 @@
  * @param op Hash table operations structure.
  */
-void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op)
+void hash_table_create(hash_table_t *h, size_t m, size_t max_keys, hash_table_operations_t *op)
 {
-	index_t i;
+	size_t i;
 
 	ASSERT(h);
@@ -84,5 +84,5 @@
 void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item)
 {
-	index_t chain;
+	size_t chain;
 	
 	ASSERT(item);
@@ -108,5 +108,5 @@
 {
 	link_t *cur;
-	index_t chain;
+	size_t chain;
 	
 	ASSERT(h);
@@ -138,7 +138,7 @@
  * @param keys Number of keys in the key array.
  */
-void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys)
+void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys)
 {
-	index_t chain;
+	size_t chain;
 	link_t *cur;