Index: uspace/lib/posix/sys/stat.h
===================================================================
--- uspace/lib/posix/sys/stat.h	(revision dddc3d9a284915ba47db462a4d5b7fdcb2748f67)
+++ uspace/lib/posix/sys/stat.h	(revision 4c87a7f5b0ff753364d9bc4cad20d3a9e27cb7b3)
@@ -40,9 +40,4 @@
 #include "types.h"
 #include "../time.h"
-#include <ipc/devmap.h>
-#include <task.h>
-
-typedef devmap_handle_t posix_dev_t;
-typedef task_id_t posix_pid_t;
 
 /* values are the same as on Linux */
@@ -139,6 +134,4 @@
 
 #ifndef LIBPOSIX_INTERNAL
-	#define dev_t posix_dev_t
-	#define pid_t posix_pid_t
 	#define fstat posix_fstat
 	#define lstat posix_lstat
Index: uspace/lib/posix/sys/types.h
===================================================================
--- uspace/lib/posix/sys/types.h	(revision dddc3d9a284915ba47db462a4d5b7fdcb2748f67)
+++ uspace/lib/posix/sys/types.h	(revision 4c87a7f5b0ff753364d9bc4cad20d3a9e27cb7b3)
@@ -46,4 +46,6 @@
 typedef unsigned int posix_blksize_t;
 typedef unsigned int posix_blkcnt_t;
+typedef uint64_t posix_pid_t;
+typedef sysarg_t posix_dev_t;
 
 #ifndef LIBPOSIX_INTERNAL
@@ -55,4 +57,6 @@
 	#define blksize_t posix_blksize_t
 	#define blkcnt_t posix_blkcnt_t
+	#define pid_t posix_pid_t
+	#define dev_t posix_dev_t
 #endif