Index: uspace/lib/c/include/sys/time.h
===================================================================
--- uspace/lib/c/include/sys/time.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/c/include/sys/time.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -93,6 +93,6 @@
 extern int time_local2str(const time_t, char *);
 extern double difftime(time_t, time_t);
-extern size_t strftime(char *restrict, size_t, const char *restrict,
-    const struct tm *restrict);
+extern size_t strftime(char *__restrict__, size_t, const char *__restrict__,
+    const struct tm *__restrict__);
 
 #endif
Index: uspace/lib/posix/include/posix/inttypes.h
===================================================================
--- uspace/lib/posix/include/posix/inttypes.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/inttypes.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -43,8 +43,8 @@
 #include "libc/inttypes.h"
 
-extern intmax_t __POSIX_DEF__(strtoimax)(const char *restrict nptr,
-    char **restrict endptr, int base);
-extern uintmax_t __POSIX_DEF__(strtoumax)(const char *restrict nptr,
-    char **restrict endptr, int base);
+extern intmax_t __POSIX_DEF__(strtoimax)(const char *__restrict__ nptr,
+    char **__restrict__ endptr, int base);
+extern uintmax_t __POSIX_DEF__(strtoumax)(const char *__restrict__ nptr,
+    char **__restrict__ endptr, int base);
 
 
Index: uspace/lib/posix/include/posix/pthread.h
===================================================================
--- uspace/lib/posix/include/posix/pthread.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/pthread.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -80,6 +80,6 @@
 extern int pthread_attr_destroy(pthread_attr_t *);
 
-extern int pthread_mutex_init(pthread_mutex_t *restrict,
-    const pthread_mutexattr_t *restrict);
+extern int pthread_mutex_init(pthread_mutex_t *__restrict__,
+    const pthread_mutexattr_t *__restrict__);
 extern int pthread_mutex_destroy(pthread_mutex_t *);
 extern int pthread_mutex_lock(pthread_mutex_t *);
@@ -89,17 +89,17 @@
 extern int pthread_mutexattr_init(pthread_mutexattr_t *);
 extern int pthread_mutexattr_destroy(pthread_mutexattr_t *);
-extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *restrict,
-    int *restrict);
+extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict__,
+    int *__restrict__);
 extern int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 
-extern int pthread_cond_init(pthread_cond_t *restrict,
-    const pthread_condattr_t *restrict);
+extern int pthread_cond_init(pthread_cond_t *__restrict__,
+    const pthread_condattr_t *__restrict__);
 extern int pthread_cond_destroy(pthread_cond_t *);
 extern int pthread_cond_broadcast(pthread_cond_t *);
 extern int pthread_cond_signal(pthread_cond_t *);
-extern int pthread_cond_timedwait(pthread_cond_t *restrict,
-    pthread_mutex_t *restrict, const struct __POSIX_DEF__(timespec) *restrict);
-extern int pthread_cond_wait(pthread_cond_t *restrict,
-    pthread_mutex_t *restrict);
+extern int pthread_cond_timedwait(pthread_cond_t *__restrict__,
+    pthread_mutex_t *__restrict__, const struct __POSIX_DEF__(timespec) *__restrict__);
+extern int pthread_cond_wait(pthread_cond_t *__restrict__,
+    pthread_mutex_t *__restrict__);
 
 extern int pthread_condattr_destroy(pthread_condattr_t *);
Index: uspace/lib/posix/include/posix/signal.h
===================================================================
--- uspace/lib/posix/include/posix/signal.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/signal.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -229,6 +229,6 @@
 };
 
-extern int __POSIX_DEF__(sigaction)(int sig, const struct __POSIX_DEF__(sigaction) *restrict act,
-    struct __POSIX_DEF__(sigaction) *restrict oact);
+extern int __POSIX_DEF__(sigaction)(int sig, const struct __POSIX_DEF__(sigaction) *__restrict__ act,
+    struct __POSIX_DEF__(sigaction) *__restrict__ oact);
 
 extern void (*__POSIX_DEF__(signal)(int sig, void (*func)(int)))(int);
@@ -246,8 +246,8 @@
 extern int __POSIX_DEF__(sigismember)(const __POSIX_DEF__(sigset_t) *set, int signo);
 
-extern int __POSIX_DEF__(thread_sigmask)(int how, const __POSIX_DEF__(sigset_t) *restrict set,
-    __POSIX_DEF__(sigset_t) *restrict oset);
-extern int __POSIX_DEF__(sigprocmask)(int how, const __POSIX_DEF__(sigset_t) *restrict set,
-    __POSIX_DEF__(sigset_t) *restrict oset);
+extern int __POSIX_DEF__(thread_sigmask)(int how, const __POSIX_DEF__(sigset_t) *__restrict__ set,
+    __POSIX_DEF__(sigset_t) *__restrict__ oset);
+extern int __POSIX_DEF__(sigprocmask)(int how, const __POSIX_DEF__(sigset_t) *__restrict__ set,
+    __POSIX_DEF__(sigset_t) *__restrict__ oset);
 
 
Index: uspace/lib/posix/include/posix/stdio.h
===================================================================
--- uspace/lib/posix/include/posix/stdio.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/stdio.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -143,16 +143,16 @@
 #undef putc
 #define putc fputc
-extern int __POSIX_DEF__(fputs)(const char *restrict s, FILE *restrict stream);
+extern int __POSIX_DEF__(fputs)(const char *__restrict__ s, FILE *__restrict__ stream);
 #undef getc
 #define getc fgetc
 extern int __POSIX_DEF__(ungetc)(int c, FILE *stream);
-extern ssize_t __POSIX_DEF__(getdelim)(char **restrict lineptr, size_t *restrict n,
-    int delimiter, FILE *restrict stream);
-extern ssize_t __POSIX_DEF__(getline)(char **restrict lineptr, size_t *restrict n,
-    FILE *restrict stream);
+extern ssize_t __POSIX_DEF__(getdelim)(char **__restrict__ lineptr, size_t *__restrict__ n,
+    int delimiter, FILE *__restrict__ stream);
+extern ssize_t __POSIX_DEF__(getline)(char **__restrict__ lineptr, size_t *__restrict__ n,
+    FILE *__restrict__ stream);
 
 /* Opening Streams */
-extern FILE *__POSIX_DEF__(freopen)(const char *restrict filename,
-    const char *restrict mode, FILE *restrict stream);
+extern FILE *__POSIX_DEF__(freopen)(const char *__restrict__ filename,
+    const char *__restrict__ mode, FILE *__restrict__ stream);
 
 /* Error Messages */
@@ -165,5 +165,5 @@
 
 extern int __POSIX_DEF__(fsetpos)(FILE *stream, const __POSIX_DEF__(fpos_t) *pos);
-extern int __POSIX_DEF__(fgetpos)(FILE *restrict stream, __POSIX_DEF__(fpos_t) *restrict pos);
+extern int __POSIX_DEF__(fgetpos)(FILE *__restrict__ stream, __POSIX_DEF__(fpos_t) *__restrict__ pos);
 extern int __POSIX_DEF__(fseek)(FILE *stream, long offset, int whence);
 extern int __POSIX_DEF__(fseeko)(FILE *stream, __POSIX_DEF__(off_t) offset, int whence);
@@ -175,22 +175,22 @@
 
 /* Formatted Output */
-extern int __POSIX_DEF__(dprintf)(int fildes, const char *restrict format, ...)
+extern int __POSIX_DEF__(dprintf)(int fildes, const char *__restrict__ format, ...)
     PRINTF_ATTRIBUTE(2, 3);
-extern int __POSIX_DEF__(vdprintf)(int fildes, const char *restrict format, va_list ap);
-extern int __POSIX_DEF__(sprintf)(char *restrict s, const char *restrict format, ...)
+extern int __POSIX_DEF__(vdprintf)(int fildes, const char *__restrict__ format, va_list ap);
+extern int __POSIX_DEF__(sprintf)(char *__restrict__ s, const char *__restrict__ format, ...)
     PRINTF_ATTRIBUTE(2, 3);
-extern int __POSIX_DEF__(vsprintf)(char *restrict s, const char *restrict format, va_list ap);
+extern int __POSIX_DEF__(vsprintf)(char *__restrict__ s, const char *__restrict__ format, va_list ap);
 
 /* Formatted Input */
 extern int __POSIX_DEF__(fscanf)(
-    FILE *restrict stream, const char *restrict format, ...);
+    FILE *__restrict__ stream, const char *__restrict__ format, ...);
 extern int __POSIX_DEF__(vfscanf)(
-    FILE *restrict stream, const char *restrict format, va_list arg);
-extern int __POSIX_DEF__(scanf)(const char *restrict format, ...);
-extern int __POSIX_DEF__(vscanf)(const char *restrict format, va_list arg);
+    FILE *__restrict__ stream, const char *__restrict__ format, va_list arg);
+extern int __POSIX_DEF__(scanf)(const char *__restrict__ format, ...);
+extern int __POSIX_DEF__(vscanf)(const char *__restrict__ format, va_list arg);
 extern int __POSIX_DEF__(sscanf)(
-    const char *restrict s, const char *restrict format, ...);
+    const char *__restrict__ s, const char *__restrict__ format, ...);
 extern int __POSIX_DEF__(vsscanf)(
-    const char *restrict s, const char *restrict format, va_list arg);
+    const char *__restrict__ s, const char *__restrict__ format, va_list arg);
 
 /* File Locking */
Index: uspace/lib/posix/include/posix/stdlib.h
===================================================================
--- uspace/lib/posix/include/posix/stdlib.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/stdlib.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -92,11 +92,11 @@
 
 /* Symbolic Links */
-extern char *__POSIX_DEF__(realpath)(const char *restrict name, char *restrict resolved);
+extern char *__POSIX_DEF__(realpath)(const char *__restrict__ name, char *__restrict__ resolved);
 
 /* Floating Point Conversion */
 extern double __POSIX_DEF__(atof)(const char *nptr);
-extern float __POSIX_DEF__(strtof)(const char *restrict nptr, char **restrict endptr);
-extern double __POSIX_DEF__(strtod)(const char *restrict nptr, char **restrict endptr);
-extern long double __POSIX_DEF__(strtold)(const char *restrict nptr, char **restrict endptr);
+extern float __POSIX_DEF__(strtof)(const char *__restrict__ nptr, char **__restrict__ endptr);
+extern double __POSIX_DEF__(strtod)(const char *__restrict__ nptr, char **__restrict__ endptr);
+extern long double __POSIX_DEF__(strtold)(const char *__restrict__ nptr, char **__restrict__ endptr);
 
 /* Integer Conversion */
@@ -104,12 +104,12 @@
 extern long int __POSIX_DEF__(atol)(const char *nptr);
 extern long long int __POSIX_DEF__(atoll)(const char *nptr);
-extern long int __POSIX_DEF__(strtol)(const char *restrict nptr,
-    char **restrict endptr, int base);
-extern long long int __POSIX_DEF__(strtoll)(const char *restrict nptr,
-    char **restrict endptr, int base);
-extern unsigned long int __POSIX_DEF__(strtoul)(const char *restrict nptr,
-    char **restrict endptr, int base);
+extern long int __POSIX_DEF__(strtol)(const char *__restrict__ nptr,
+    char **__restrict__ endptr, int base);
+extern long long int __POSIX_DEF__(strtoll)(const char *__restrict__ nptr,
+    char **__restrict__ endptr, int base);
+extern unsigned long int __POSIX_DEF__(strtoul)(const char *__restrict__ nptr,
+    char **__restrict__ endptr, int base);
 extern unsigned long long int __POSIX_DEF__(strtoull)(
-    const char *restrict nptr, char **restrict endptr, int base);
+    const char *__restrict__ nptr, char **__restrict__ endptr, int base);
 
 /* Memory Allocation */
Index: uspace/lib/posix/include/posix/string.h
===================================================================
--- uspace/lib/posix/include/posix/string.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/string.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -48,5 +48,5 @@
  * int      strcoll_l(const char *, const char *, locale_t);
  * char    *strerror_l(int, locale_t);
- * size_t   strxfrm_l(char *restrict, const char *restrict, size_t, locale_t);
+ * size_t   strxfrm_l(char *__restrict__, const char *__restrict__, size_t, locale_t);
  */
 
@@ -74,11 +74,11 @@
 
 /* Copying and Concatenation */
-extern char *__POSIX_DEF__(strcpy)(char *restrict dest, const char *restrict src);
-extern char *__POSIX_DEF__(strncpy)(char *restrict dest, const char *restrict src, size_t n);
-extern char *__POSIX_DEF__(stpcpy)(char *restrict dest, const char *restrict src);
-extern char *__POSIX_DEF__(stpncpy)(char *restrict dest, const char *restrict src, size_t n);
-extern char *__POSIX_DEF__(strcat)(char *restrict dest, const char *restrict src);
-extern char *__POSIX_DEF__(strncat)(char *restrict dest, const char *restrict src, size_t n);
-extern void *__POSIX_DEF__(memccpy)(void *restrict dest, const void *restrict src, int c, size_t n);
+extern char *__POSIX_DEF__(strcpy)(char *__restrict__ dest, const char *__restrict__ src);
+extern char *__POSIX_DEF__(strncpy)(char *__restrict__ dest, const char *__restrict__ src, size_t n);
+extern char *__POSIX_DEF__(stpcpy)(char *__restrict__ dest, const char *__restrict__ src);
+extern char *__POSIX_DEF__(stpncpy)(char *__restrict__ dest, const char *__restrict__ src, size_t n);
+extern char *__POSIX_DEF__(strcat)(char *__restrict__ dest, const char *__restrict__ src);
+extern char *__POSIX_DEF__(strncat)(char *__restrict__ dest, const char *__restrict__ src, size_t n);
+extern void *__POSIX_DEF__(memccpy)(void *__restrict__ dest, const void *__restrict__ src, int c, size_t n);
 extern char *__POSIX_DEF__(strdup)(const char *s);
 extern char *__POSIX_DEF__(strndup)(const char *s, size_t n);
@@ -106,5 +106,5 @@
 /* Collation Functions */
 extern int __POSIX_DEF__(strcoll)(const char *s1, const char *s2);
-extern size_t __POSIX_DEF__(strxfrm)(char *restrict s1, const char *restrict s2, size_t n);
+extern size_t __POSIX_DEF__(strxfrm)(char *__restrict__ s1, const char *__restrict__ s2, size_t n);
 
 /* Error Messages */
Index: uspace/lib/posix/include/posix/sys/stat.h
===================================================================
--- uspace/lib/posix/include/posix/sys/stat.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/sys/stat.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -129,6 +129,6 @@
 
 extern int __POSIX_DEF__(fstat)(int fd, struct __POSIX_DEF__(stat) *st);
-extern int __POSIX_DEF__(lstat)(const char *restrict path, struct __POSIX_DEF__(stat) *restrict st);
-extern int __POSIX_DEF__(stat)(const char *restrict path, struct __POSIX_DEF__(stat) *restrict st);
+extern int __POSIX_DEF__(lstat)(const char *__restrict__ path, struct __POSIX_DEF__(stat) *__restrict__ st);
+extern int __POSIX_DEF__(stat)(const char *__restrict__ path, struct __POSIX_DEF__(stat) *__restrict__ st);
 extern int __POSIX_DEF__(chmod)(const char *path, __POSIX_DEF__(mode_t) mode);
 extern __POSIX_DEF__(mode_t) __POSIX_DEF__(umask)(__POSIX_DEF__(mode_t) mask);
Index: uspace/lib/posix/include/posix/time.h
===================================================================
--- uspace/lib/posix/include/posix/time.h	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
+++ uspace/lib/posix/include/posix/time.h	(revision af9f2713e4ff69fa111b9bbbc7ad69ee5fb841ce)
@@ -89,15 +89,15 @@
 
 /* Broken-down Time */
-extern struct tm *__POSIX_DEF__(gmtime_r)(const time_t *restrict timer,
-    struct tm *restrict result);
-extern struct tm *__POSIX_DEF__(gmtime)(const time_t *restrict timep);
-extern struct tm *__POSIX_DEF__(localtime_r)(const time_t *restrict timer,
-    struct tm *restrict result);
-extern struct tm *__POSIX_DEF__(localtime)(const time_t *restrict timep);
+extern struct tm *__POSIX_DEF__(gmtime_r)(const time_t *__restrict__ timer,
+    struct tm *__restrict__ result);
+extern struct tm *__POSIX_DEF__(gmtime)(const time_t *__restrict__ timep);
+extern struct tm *__POSIX_DEF__(localtime_r)(const time_t *__restrict__ timer,
+    struct tm *__restrict__ result);
+extern struct tm *__POSIX_DEF__(localtime)(const time_t *__restrict__ timep);
 
 /* Formatting Calendar Time */
-extern char *__POSIX_DEF__(asctime_r)(const struct tm *restrict timeptr,
-    char *restrict buf);
-extern char *__POSIX_DEF__(asctime)(const struct tm *restrict timeptr);
+extern char *__POSIX_DEF__(asctime_r)(const struct tm *__restrict__ timeptr,
+    char *__restrict__ buf);
+extern char *__POSIX_DEF__(asctime)(const struct tm *__restrict__ timeptr);
 extern char *__POSIX_DEF__(ctime_r)(const time_t *timer, char *buf);
 extern char *__POSIX_DEF__(ctime)(const time_t *timer);