Index: uspace/lib/posix/src/stdio/scanf.c
===================================================================
--- uspace/lib/posix/src/stdio/scanf.c	(revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e)
+++ uspace/lib/posix/src/stdio/scanf.c	(revision 1ab3c4b698c08d84c77675ba474ca8dfd5164dbc)
@@ -33,7 +33,4 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include <assert.h>
 
@@ -119,5 +116,5 @@
 	/* Initialize internal structures. */
 	self->consumed = 0;
-	ssize_t fetched = posix_getline(
+	ssize_t fetched = getline(
 	    &self->window, &self->window_size, self->source.stream);
 	if (fetched != -1) {
@@ -140,5 +137,5 @@
 	/* Initialize internal structures. */
 	self->consumed = 0;
-	self->fetched = posix_strlen(self->source.string);
+	self->fetched = strlen(self->source.string);
 	self->window = (char *) self->source.string;
 	self->window_size = self->fetched + 1;
@@ -158,5 +155,5 @@
 		/* Do we need to fetch a new line from the source? */
 		if (*self->cursor == '\0') {
-			ssize_t fetched = posix_getline(&self->window,
+			ssize_t fetched = getline(&self->window,
 			    &self->window_size, self->source.stream);
 			if (fetched != -1) {
@@ -208,11 +205,10 @@
 		 * containing newline, while at the same time newline is the character
 		 * that breaks the matching process. */
-		int rc = posix_fseek(
-		    self->source.stream, -1, SEEK_CUR);
+		int rc = fseek(self->source.stream, -1, SEEK_CUR);
 		if (rc == -1) {
 			/* Seek failed.  */
 			return 0;
 		}
-		ssize_t fetched = posix_getline(&self->window,
+		ssize_t fetched = getline(&self->window,
 		    &self->window_size, self->source.stream);
 		if (fetched != -1) {
@@ -266,5 +262,5 @@
 	if (*self->cursor == '\0') {
 		/* Window was completely consumed, fetch new data. */
-		ssize_t fetched = posix_getline(&self->window,
+		ssize_t fetched = getline(&self->window,
 		    &self->window_size, self->source.stream);
 		if (fetched != -1) {
@@ -298,5 +294,5 @@
 	/* Try to correct the difference between the stream position and what was
 	 * actually consumed. If it is not possible, continue anyway. */
-	posix_fseek(self->source.stream, self->consumed - self->fetched, SEEK_CUR);
+	fseek(self->source.stream, self->consumed - self->fetched, SEEK_CUR);
 
 	/* Destruct internal structures. */
@@ -638,5 +634,5 @@
 				 * than allowed by width. */
 				if (width != -1) {
-					cur_duplicated = posix_strndup(cur_borrowed, width);
+					cur_duplicated = strndup(cur_borrowed, width);
 					cur_limited = cur_duplicated;
 				} else {
@@ -812,5 +808,5 @@
 				 * than allowed by width. */
 				if (width != -1) {
-					cur_duplicated = posix_strndup(cur_borrowed, width);
+					cur_duplicated = strndup(cur_borrowed, width);
 					cur_limited = cur_duplicated;
 				} else {
@@ -826,11 +822,11 @@
 				switch (length_mod) {
 				case LMOD_NONE:
-					fres = posix_strtof(cur_limited, (char **) &cur_updated);
+					fres = strtof(cur_limited, (char **) &cur_updated);
 					break;
 				case LMOD_l:
-					dres = posix_strtod(cur_limited, (char **) &cur_updated);
+					dres = strtod(cur_limited, (char **) &cur_updated);
 					break;
 				case LMOD_L:
-					ldres = posix_strtold(cur_limited, (char **) &cur_updated);
+					ldres = strtold(cur_limited, (char **) &cur_updated);
 					break;
 				default:
@@ -1194,5 +1190,5 @@
  * @return The number of converted output items or EOF on failure.
  */
-int posix_vfscanf(
+int vfscanf(
     FILE *restrict stream, const char *restrict format, va_list arg)
 {
@@ -1214,5 +1210,5 @@
  * @return The number of converted output items or EOF on failure.
  */
-int posix_vsscanf(
+int vsscanf(
     const char *restrict s, const char *restrict format, va_list arg)
 {
