Index: uspace/lib/c/generic/adt/hash_table.c
===================================================================
--- uspace/lib/c/generic/adt/hash_table.c	(revision d1582b502edcb7bfeef771a2019538f265e7e27c)
+++ uspace/lib/c/generic/adt/hash_table.c	(revision b27553c1c5a811aeba3e07e95c353cebbbed5ccd)
@@ -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 d1582b502edcb7bfeef771a2019538f265e7e27c)
+++ uspace/lib/c/generic/adt/list.c	(revision b27553c1c5a811aeba3e07e95c353cebbbed5ccd)
@@ -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);