Index: uspace/lib/posix/sys/stat.h
===================================================================
--- uspace/lib/posix/sys/stat.h	(revision fb90deb97a9150b88c9d015fcaaf33d2f1291e14)
+++ uspace/lib/posix/sys/stat.h	(revision da084d96ab8fdfbf67a3a1de0826a96cb2f0295d)
@@ -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 fb90deb97a9150b88c9d015fcaaf33d2f1291e14)
+++ uspace/lib/posix/sys/types.h	(revision da084d96ab8fdfbf67a3a1de0826a96cb2f0295d)
@@ -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