Index: kernel/genarch/src/acpi/madt.c
===================================================================
--- kernel/genarch/src/acpi/madt.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/acpi/madt.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -63,9 +63,9 @@
 struct madt_io_apic *madt_io_apic_entries = NULL;
 
-index_t madt_l_apic_entry_index = 0;
-index_t madt_io_apic_entry_index = 0;
-count_t madt_l_apic_entry_cnt = 0;
-count_t madt_io_apic_entry_cnt = 0;
-count_t cpu_count = 0;
+size_t madt_l_apic_entry_index = 0;
+size_t madt_io_apic_entry_index = 0;
+size_t madt_l_apic_entry_cnt = 0;
+size_t madt_io_apic_entry_cnt = 0;
+size_t cpu_count = 0;
 
 struct madt_apic_header * * madt_entries_index = NULL;
@@ -87,8 +87,8 @@
  * ACPI MADT Implementation of SMP configuration interface.
  */
-static count_t madt_cpu_count(void);
-static bool madt_cpu_enabled(index_t i);
-static bool madt_cpu_bootstrap(index_t i);
-static uint8_t madt_cpu_apic_id(index_t i);
+static size_t madt_cpu_count(void);
+static bool madt_cpu_enabled(size_t i);
+static bool madt_cpu_bootstrap(size_t i);
+static uint8_t madt_cpu_apic_id(size_t i);
 static int madt_irq_to_pin(unsigned int irq);
 
@@ -101,10 +101,10 @@
 };
 
-count_t madt_cpu_count(void)
+size_t madt_cpu_count(void)
 {
 	return madt_l_apic_entry_cnt;
 }
 
-bool madt_cpu_enabled(index_t i)
+bool madt_cpu_enabled(size_t i)
 {
 	ASSERT(i < madt_l_apic_entry_cnt);
@@ -113,5 +113,5 @@
 }
 
-bool madt_cpu_bootstrap(index_t i)
+bool madt_cpu_bootstrap(size_t i)
 {
 	ASSERT(i < madt_l_apic_entry_cnt);
@@ -119,5 +119,5 @@
 }
 
-uint8_t madt_cpu_apic_id(index_t i)
+uint8_t madt_cpu_apic_id(size_t i)
 {
 	ASSERT(i < madt_l_apic_entry_cnt);
Index: kernel/genarch/src/mm/asid.c
===================================================================
--- kernel/genarch/src/mm/asid.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/mm/asid.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -66,5 +66,5 @@
 #include <debug.h>
 
-static count_t asids_allocated = 0;
+static size_t asids_allocated = 0;
 
 /** Allocate free address space identifier.
@@ -121,5 +121,5 @@
 		 * cache must be invalidated as well.
 		 */
-		as_invalidate_translation_cache(as, 0, (count_t) -1);
+		as_invalidate_translation_cache(as, 0, (size_t) -1);
 		
 		/*
Index: kernel/genarch/src/mm/page_ht.c
===================================================================
--- kernel/genarch/src/mm/page_ht.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/mm/page_ht.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -52,6 +52,6 @@
 #include <align.h>
 
-static index_t hash(unative_t key[]);
-static bool compare(unative_t key[], count_t keys, link_t *item);
+static size_t hash(unative_t key[]);
+static bool compare(unative_t key[], size_t keys, link_t *item);
 static void remove_callback(link_t *item);
 
@@ -94,9 +94,9 @@
  * @return Index into page hash table.
  */
-index_t hash(unative_t key[])
+size_t hash(unative_t key[])
 {
 	as_t *as = (as_t *) key[KEY_AS];
 	uintptr_t page = (uintptr_t) key[KEY_PAGE];
-	index_t index;
+	size_t index;
 	
 	/*
@@ -125,5 +125,5 @@
  * @return true on 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)
 {
 	pte_t *t;
Index: kernel/genarch/src/ofw/ebus.c
===================================================================
--- kernel/genarch/src/ofw/ebus.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/ofw/ebus.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -50,5 +50,5 @@
 	ofw_tree_property_t *prop;
 	ofw_ebus_range_t *range;
-	count_t ranges;
+	size_t ranges;
 
 	prop = ofw_tree_getprop(node, "ranges");
@@ -92,5 +92,5 @@
 
 	ofw_ebus_intr_map_t *intr_map = prop->value;
-	count_t count = prop->size / sizeof(ofw_ebus_intr_map_t);
+	size_t count = prop->size / sizeof(ofw_ebus_intr_map_t);
 	
 	ASSERT(count);
Index: kernel/genarch/src/ofw/fhc.c
===================================================================
--- kernel/genarch/src/ofw/fhc.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/ofw/fhc.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -47,5 +47,5 @@
 	ofw_tree_property_t *prop;
 	ofw_fhc_range_t *range;
-	count_t ranges;
+	size_t ranges;
 
 	prop = ofw_tree_getprop(node, "ranges");
@@ -89,5 +89,5 @@
 	ofw_tree_property_t *prop;
 	ofw_central_range_t *range;
-	count_t ranges;
+	size_t ranges;
 	
 	prop = ofw_tree_getprop(node, "ranges");
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -248,5 +248,6 @@
 	char buf[NAME_BUF_LEN + 1];
 	ofw_tree_node_t *node = ofw_root;
-	index_t i, j;
+	size_t i;
+	size_t j;
 	
 	if (path[0] != '/')
Index: kernel/genarch/src/ofw/pci.c
===================================================================
--- kernel/genarch/src/ofw/pci.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/ofw/pci.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -55,5 +55,5 @@
 	ofw_tree_property_t *prop;
 	ofw_pci_range_t *range;
-	count_t ranges;
+	size_t ranges;
 
 	prop = ofw_tree_getprop(node, "ranges");
@@ -98,5 +98,5 @@
 	ofw_tree_property_t *prop;
 	ofw_pci_reg_t *assigned_address;
-	count_t assigned_addresses;
+	size_t assigned_addresses;
 	
 	prop = ofw_tree_getprop(node, "assigned-addresses");
Index: kernel/genarch/src/ofw/sbus.c
===================================================================
--- kernel/genarch/src/ofw/sbus.c	(revision d797054cdc54aa797b379a8dad9eefeafc99acf6)
+++ kernel/genarch/src/ofw/sbus.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -44,5 +44,5 @@
 	ofw_tree_property_t *prop;
 	ofw_sbus_range_t *range;
-	count_t ranges;
+	size_t ranges;
 	
 	/*