Index: uspace/lib/posix/src/sys/mman.c
===================================================================
--- uspace/lib/posix/src/sys/mman.c	(revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e)
+++ uspace/lib/posix/src/sys/mman.c	(revision 2752620b090f5bf0ecc3baace21dc1fa5da89d73)
@@ -33,7 +33,4 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include <posix/sys/mman.h>
@@ -42,6 +39,6 @@
 #include <posix/unistd.h>
 
-void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
-    __POSIX_DEF__(off_t) offset)
+void *mmap(void *start, size_t length, int prot, int flags, int fd,
+    off_t offset)
 {
 	if (!start)
@@ -57,5 +54,5 @@
 }
 
-int posix_munmap(void *start, size_t length)
+int munmap(void *start, size_t length)
 {
 	int rc = as_area_destroy(start);
Index: uspace/lib/posix/src/sys/stat.c
===================================================================
--- uspace/lib/posix/src/sys/stat.c	(revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e)
+++ uspace/lib/posix/src/sys/stat.c	(revision 2752620b090f5bf0ecc3baace21dc1fa5da89d73)
@@ -34,7 +34,4 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include "posix/sys/stat.h"
@@ -52,7 +49,7 @@
  * @return 0 on success, -1 on error.
  */
-static int stat_to_posix(struct posix_stat *dest, vfs_stat_t *src)
+static int stat_to_posix(struct stat *dest, vfs_stat_t *src)
 {
-	memset(dest, 0, sizeof(struct posix_stat));
+	memset(dest, 0, sizeof(struct stat));
 	
 	dest->st_dev = src->service;
@@ -86,5 +83,5 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_fstat(int fd, struct posix_stat *st)
+int fstat(int fd, struct stat *st)
 {
 	vfs_stat_t hst;
@@ -101,8 +98,8 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_lstat(const char *restrict path, struct posix_stat *restrict st)
+int lstat(const char *restrict path, struct stat *restrict st)
 {
 	/* There are currently no symbolic links in HelenOS. */
-	return posix_stat(path, st);
+	return stat(path, st);
 }
 
@@ -114,5 +111,5 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_stat(const char *restrict path, struct posix_stat *restrict st)
+int stat(const char *restrict path, struct stat *restrict st)
 {
 	vfs_stat_t hst;
@@ -129,5 +126,5 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_chmod(const char *path, posix_mode_t mode)
+int chmod(const char *path, mode_t mode)
 {
 	/* HelenOS doesn't support permissions, return success. */
@@ -142,5 +139,5 @@
  * @return Previous file mode creation mask.
  */
-posix_mode_t posix_umask(posix_mode_t mask)
+mode_t umask(mode_t mask)
 {
 	/* HelenOS doesn't support permissions, return empty mask. */
@@ -155,5 +152,5 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_mkdir(const char *path, posix_mode_t mode)
+int mkdir(const char *path, mode_t mode)
 {
 	if (failed(vfs_link_path(path, KIND_DIRECTORY, NULL)))
Index: uspace/lib/posix/src/sys/wait.c
===================================================================
--- uspace/lib/posix/src/sys/wait.c	(revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e)
+++ uspace/lib/posix/src/sys/wait.c	(revision 2752620b090f5bf0ecc3baace21dc1fa5da89d73)
@@ -33,7 +33,4 @@
 /** @file Support for waiting.
  */
-
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
 
 #include "../internal/common.h"
@@ -76,9 +73,9 @@
  *     -1 on signal interrupt, (pid_t)-1 otherwise.
  */
-posix_pid_t posix_wait(int *stat_ptr)
+pid_t wait(int *stat_ptr)
 {
 	/* HelenOS does not support this. */
 	errno = ENOSYS;
-	return (posix_pid_t) -1;
+	return (pid_t) -1;
 }
 
@@ -94,5 +91,5 @@
  *     no child process whose status can be reported, (pid_t)-1 otherwise.
  */
-posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options)
+pid_t waitpid(pid_t pid, int *stat_ptr, int options)
 {
 	assert(stat_ptr != NULL);
@@ -104,5 +101,5 @@
 	if (failed(task_wait_task_id((task_id_t) pid, &texit, &retval))) {
 		/* Unable to retrieve status. */
-		return (posix_pid_t) -1;
+		return (pid_t) -1;
 	}