Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision c822026c1caa1849e2dc6fdf00e865eb4b1ff15c)
+++ kernel/generic/src/ddi/ddi.c	(revision 4a68194df2c9adee6f05acf34c5c51ef658f99d2)
@@ -98,5 +98,5 @@
  *
  */
-static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, count_t pages, int flags)
+static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages, int flags)
 {
 	ASSERT(TASK);
@@ -119,7 +119,7 @@
 	/* Find the zone of the physical memory */
 	spinlock_lock(&zones.lock);
-	count_t znum = find_zone(ADDR2PFN(pf), pages, 0);
-	
-	if (znum == (count_t) -1) {
+	size_t znum = find_zone(ADDR2PFN(pf), pages, 0);
+	
+	if (znum == (size_t) -1) {
 		/* Frames not found in any zones
 		 * -> assume it is hardware device and allow mapping
@@ -243,5 +243,5 @@
 	return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
 	    FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
-	    (count_t) pages, (int) flags);
+	    (size_t) pages, (int) flags);
 }
 
Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision c822026c1caa1849e2dc6fdf00e865eb4b1ff15c)
+++ kernel/generic/src/ddi/irq.c	(revision 4a68194df2c9adee6f05acf34c5c51ef658f99d2)
@@ -100,6 +100,6 @@
  * there will be collisions between different keys.
  */
-static index_t irq_ht_hash(unative_t *key);
-static bool irq_ht_compare(unative_t *key, count_t keys, link_t *item);
+static size_t irq_ht_hash(unative_t *key);
+static bool irq_ht_compare(unative_t *key, size_t keys, link_t *item);
 static void irq_ht_remove(link_t *item);
 
@@ -116,6 +116,6 @@
  * elements with single key (sharing of one IRQ).
  */
-static index_t irq_lin_hash(unative_t *key);
-static bool irq_lin_compare(unative_t *key, count_t keys, link_t *item);
+static size_t irq_lin_hash(unative_t *key);
+static bool irq_lin_compare(unative_t *key, size_t keys, link_t *item);
 static void irq_lin_remove(link_t *item);
 
@@ -127,5 +127,5 @@
 
 /** Number of buckets in either of the hash tables. */
-static count_t buckets;
+static size_t buckets;
 
 /** Initialize IRQ subsystem.
@@ -134,5 +134,5 @@
  * @param chains Number of chains in the hash table.
  */
-void irq_init(count_t inrs, count_t chains)
+void irq_init(size_t inrs, size_t chains)
 {
 	buckets = chains;
@@ -299,5 +299,5 @@
  * @return Index into the hash table.
  */
-index_t irq_ht_hash(unative_t key[])
+size_t irq_ht_hash(unative_t key[])
 {
 	inr_t inr = (inr_t) key[KEY_INR];
@@ -325,5 +325,5 @@
  * @return True on match or false otherwise.
  */
-bool irq_ht_compare(unative_t key[], count_t keys, link_t *item)
+bool irq_ht_compare(unative_t key[], size_t keys, link_t *item)
 {
 	irq_t *irq = hash_table_get_instance(item, irq_t, link);
@@ -372,5 +372,5 @@
  * @return Index into the hash table.
  */
-index_t irq_lin_hash(unative_t key[])
+size_t irq_lin_hash(unative_t key[])
 {
 	inr_t inr = (inr_t) key[KEY_INR];
@@ -398,5 +398,5 @@
  * @return True on match or false otherwise.
  */
-bool irq_lin_compare(unative_t key[], count_t keys, link_t *item)
+bool irq_lin_compare(unative_t key[], size_t keys, link_t *item)
 {
 	irq_t *irq = list_get_instance(item, irq_t, link);