Index: uspace/lib/c/include/stdio.h
===================================================================
--- uspace/lib/c/include/stdio.h	(revision 1848f8e4741731f1df7e2d2c9d8441d27ddb940b)
+++ uspace/lib/c/include/stdio.h	(revision bc1b297f15cd810ce68ce27f528b9e97ba351a1a)
@@ -58,24 +58,4 @@
 #define BUFSIZ  4096
 
-enum _buffer_type {
-	/** No buffering */
-	_IONBF,
-	/** Line buffering */
-	_IOLBF,
-	/** Full buffering */
-	_IOFBF
-};
-
-enum _buffer_state {
-	/** Buffer is empty */
-	_bs_empty,
-
-	/** Buffer contains data to be written */
-	_bs_write,
-
-	/** Buffer contains prefetched data for reading */
-	_bs_read
-};
-
 /** Forward declaration */
 struct _IO_FILE;
@@ -91,5 +71,4 @@
 
 extern int getchar(void);
-extern char *gets(char *, size_t);
 
 /* Character and string output functions */
@@ -118,11 +97,6 @@
 extern int vsnprintf(char *, size_t, const char *, va_list);
 
-extern int printf_size(const char *, ...)
-    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
-extern int vprintf_size(const char *, va_list);
-
 /* File stream functions */
 extern FILE *fopen(const char *, const char *);
-extern FILE *fdopen(int, const char *);
 extern FILE *freopen(const char *, const char *, FILE *);
 extern int fclose(FILE *);
@@ -135,5 +109,4 @@
 extern long ftell(FILE *);
 extern int feof(FILE *);
-extern int fileno(FILE *);
 
 extern int fflush(FILE *);
@@ -148,4 +121,44 @@
 extern int remove(const char *);
 
+#ifndef _HELENOS_SOURCE
+#define _IONBF 0
+#define _IOLBF 1
+#define _IOFBF 2
+#endif
+
+#ifdef _HELENOS_SOURCE
+
+/* Nonstandard extensions. */
+
+enum _buffer_type {
+	/** No buffering */
+	_IONBF,
+	/** Line buffering */
+	_IOLBF,
+	/** Full buffering */
+	_IOFBF
+};
+
+enum _buffer_state {
+	/** Buffer is empty */
+	_bs_empty,
+
+	/** Buffer contains data to be written */
+	_bs_write,
+
+	/** Buffer contains prefetched data for reading */
+	_bs_read
+};
+
+extern int vprintf_size(const char *, va_list);
+extern int printf_size(const char *, ...)
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
+extern FILE *fdopen(int, const char *);
+extern int fileno(FILE *);
+extern char *gets(char *, size_t);
+
+#endif
+
+
 #endif