Index: uspace/lib/c/generic/adt/hash_table.c
===================================================================
--- uspace/lib/c/generic/adt/hash_table.c	(revision d6c4d408b32d32fe8f22cbd847b0ba04ff2f7767)
+++ uspace/lib/c/generic/adt/hash_table.c	(revision 7a8af2fa103151ca5b466afc1f9b32c774e99d18)
@@ -52,4 +52,5 @@
 #include <adt/list.h>
 #include <assert.h>
+#include <member.h>
 #include <stdlib.h>
 #include <str.h>
Index: uspace/lib/c/generic/adt/list.c
===================================================================
--- uspace/lib/c/generic/adt/list.c	(revision d6c4d408b32d32fe8f22cbd847b0ba04ff2f7767)
+++ uspace/lib/c/generic/adt/list.c	(revision 7a8af2fa103151ca5b466afc1f9b32c774e99d18)
@@ -41,4 +41,5 @@
 #include <adt/list.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 /** Check for membership
@@ -100,7 +101,7 @@
  * @return		Number of items in the list.
  */
-unsigned long list_count(const list_t *list)
+size_t list_count(const list_t *list)
 {
-	unsigned long count = 0;
+	size_t count = 0;
 
 	link_t *link = list_first(list);