Index: uspace/lib/c/generic/sysinfo.c
===================================================================
--- uspace/lib/c/generic/sysinfo.c	(revision abb7491c1e50240dca865ddc6c8cf97ef8947f33)
+++ uspace/lib/c/generic/sysinfo.c	(revision 9a426d1f629f275455938b21d553365bb5146fb0)
@@ -47,7 +47,7 @@
  *
  */
-sysinfo_item_tag_t sysinfo_get_tag(const char *path)
+sysinfo_item_val_type_t sysinfo_get_val_type(const char *path)
 {
-	return (sysinfo_item_tag_t) __SYSCALL2(SYS_SYSINFO_GET_TAG,
+	return (sysinfo_item_val_type_t) __SYSCALL2(SYS_SYSINFO_GET_VAL_TYPE,
 	    (sysarg_t) path, (sysarg_t) str_size(path));
 }
Index: uspace/lib/c/include/bool.h
===================================================================
--- uspace/lib/c/include/bool.h	(revision abb7491c1e50240dca865ddc6c8cf97ef8947f33)
+++ uspace/lib/c/include/bool.h	(revision 9a426d1f629f275455938b21d553365bb5146fb0)
@@ -37,9 +37,8 @@
 
 #include <libarch/types.h>
+#include <abi/bool.h>
 
 #define false  0
 #define true   1
-
-typedef uint8_t bool;
 
 #endif
Index: uspace/lib/c/include/sysinfo.h
===================================================================
--- uspace/lib/c/include/sysinfo.h	(revision abb7491c1e50240dca865ddc6c8cf97ef8947f33)
+++ uspace/lib/c/include/sysinfo.h	(revision 9a426d1f629f275455938b21d553365bb5146fb0)
@@ -36,16 +36,9 @@
 #define LIBC_SYSINFO_H_
 
-#include <libc.h>
+#include <sys/types.h>
+#include <bool.h>
+#include <abi/sysinfo.h>
 
-/** Sysinfo value types
- *
- */
-typedef enum {
-	SYSINFO_VAL_UNDEFINED = 0,
-	SYSINFO_VAL_VAL = 1,
-	SYSINFO_VAL_DATA = 2
-} sysinfo_item_tag_t;
-
-extern sysinfo_item_tag_t sysinfo_get_tag(const char *);
+extern sysinfo_item_val_type_t sysinfo_get_val_type(const char *);
 extern int sysinfo_get_value(const char *, sysarg_t *);
 extern void *sysinfo_get_data(const char *, size_t *);
Index: uspace/lib/c/include/task.h
===================================================================
--- uspace/lib/c/include/task.h	(revision abb7491c1e50240dca865ddc6c8cf97ef8947f33)
+++ uspace/lib/c/include/task.h	(revision 9a426d1f629f275455938b21d553365bb5146fb0)
@@ -37,6 +37,5 @@
 
 #include <sys/types.h>
-
-typedef uint64_t task_id_t;
+#include <abi/proc/task.h>
 
 typedef enum {
Index: uspace/lib/c/include/thread.h
===================================================================
--- uspace/lib/c/include/thread.h	(revision abb7491c1e50240dca865ddc6c8cf97ef8947f33)
+++ uspace/lib/c/include/thread.h	(revision 9a426d1f629f275455938b21d553365bb5146fb0)
@@ -38,6 +38,5 @@
 #include <libarch/thread.h>
 #include <sys/types.h>
-
-typedef uint64_t thread_id_t;
+#include <abi/proc/thread.h>
 
 extern int thread_create(void (*)(void *), void *, const char *, thread_id_t *);