Index: src/libcfa/concurrency/monitor
===================================================================
--- src/libcfa/concurrency/monitor	(revision 025278e0ea194f101c7166809d5a4ee702acadaa)
+++ src/libcfa/concurrency/monitor	(revision c1a9c86b33a7a40edb9fb80f386caddc59c72d52)
@@ -43,5 +43,5 @@
 	int count;
 	monitor_desc ** prev_mntrs;
-	unsigned short  prev_count;
+	__lock_size_t   prev_count;
 	fptr_t          prev_func;
 };
@@ -53,5 +53,5 @@
 	monitor_desc * m;
 	monitor_desc ** prev_mntrs;
-	unsigned short  prev_count;
+	__lock_size_t   prev_count;
 	fptr_t          prev_func;
 };
@@ -81,5 +81,4 @@
 	// Intrusive linked list Next field
 	__condition_criterion_t * next;
-
 };
 
@@ -92,5 +91,5 @@
 
 	// Number of criterions in the criteria
-	unsigned short count;
+	__lock_size_t count;
 
 	// Intrusive linked list Next field
@@ -99,5 +98,4 @@
 	// Custom user info accessible before signalling
 	uintptr_t user_info;
-
 };
 
@@ -123,6 +121,5 @@
 
 	// Number of monitors in the array
-	unsigned short monitor_count;
-
+	__lock_size_t monitor_count;
 };