Index: kernel/generic/src/synch/futex.c
===================================================================
--- kernel/generic/src/synch/futex.c	(revision 44814b87de16b7d7e84bb8c660aa2b5c5269fbac)
+++ kernel/generic/src/synch/futex.c	(revision 1035437cfaf64cf0a0d58b00fba5af28339c7e42)
@@ -60,6 +60,6 @@
 
 static futex_t *futex_find(uintptr_t paddr);
-static index_t futex_ht_hash(unative_t *key);
-static bool futex_ht_compare(unative_t *key, count_t keys, link_t *item);
+static size_t futex_ht_hash(unative_t *key);
+static bool futex_ht_compare(unative_t *key, size_t keys, link_t *item);
 static void futex_ht_remove_callback(link_t *item);
 
@@ -289,7 +289,7 @@
  * @return Index into futex hash table.
  */
-index_t futex_ht_hash(unative_t *key)
-{
-	return *key & (FUTEX_HT_SIZE-1);
+size_t futex_ht_hash(unative_t *key)
+{
+	return (*key & (FUTEX_HT_SIZE - 1));
 }
 
@@ -301,5 +301,5 @@
  * @return True if the item matches the key. False otherwise.
  */
-bool futex_ht_compare(unative_t *key, count_t keys, link_t *item)
+bool futex_ht_compare(unative_t *key, size_t keys, link_t *item)
 {
 	futex_t *futex;
Index: kernel/generic/src/synch/spinlock.c
===================================================================
--- kernel/generic/src/synch/spinlock.c	(revision 44814b87de16b7d7e84bb8c660aa2b5c5269fbac)
+++ kernel/generic/src/synch/spinlock.c	(revision 1035437cfaf64cf0a0d58b00fba5af28339c7e42)
@@ -76,5 +76,5 @@
 void spinlock_lock_debug(spinlock_t *sl)
 {
-	count_t i = 0;
+	size_t i = 0;
 	bool deadlock_reported = false;
 
Index: kernel/generic/src/synch/waitq.c
===================================================================
--- kernel/generic/src/synch/waitq.c	(revision 44814b87de16b7d7e84bb8c660aa2b5c5269fbac)
+++ kernel/generic/src/synch/waitq.c	(revision 1035437cfaf64cf0a0d58b00fba5af28339c7e42)
@@ -416,5 +416,5 @@
 {
 	thread_t *t;
-	count_t count = 0;
+	size_t count = 0;
 
 loop: