Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision 59e4864a51a79cbe1c491a3c86539b884e9005e6)
+++ kernel/generic/include/synch/futex.h	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -50,5 +50,5 @@
 	link_t ht_link;
 	/** Number of tasks that reference this futex. */
-	count_t refcount;
+	size_t refcount;
 } futex_t;
 
Index: kernel/generic/include/synch/rwlock.h
===================================================================
--- kernel/generic/include/synch/rwlock.h	(revision 59e4864a51a79cbe1c491a3c86539b884e9005e6)
+++ kernel/generic/include/synch/rwlock.h	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -54,5 +54,5 @@
 	mutex_t exclusive;
 	/** Number of readers in critical section. */
-	count_t readers_in;
+	size_t readers_in;
 } rwlock_t;
 
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 59e4864a51a79cbe1c491a3c86539b884e9005e6)
+++ kernel/generic/include/synch/spinlock.h	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -108,5 +108,5 @@
 
 #define DEADLOCK_THRESHOLD		100000000
-#define DEADLOCK_PROBE_INIT(pname)	count_t pname = 0
+#define DEADLOCK_PROBE_INIT(pname)	size_t pname = 0
 #define DEADLOCK_PROBE(pname, value)					\
 	if ((pname)++ > (value)) {					\