diff --git a/libgloss/aarch64/syscalls.c b/libgloss/aarch64/syscalls.c
index 5aeb3d0b5..8198d3ed0 100644
--- a/libgloss/aarch64/syscalls.c
+++ b/libgloss/aarch64/syscalls.c
@@ -120,7 +120,7 @@ register char * stack_ptr asm ("sp");
 
 
 /* following is copied from libc/stdio/local.h to check std streams */
-extern void _EXFUN (__sinit, (struct _reent *));
+extern void __sinit (struct _reent *);
 #define CHECK_INIT(ptr) \
   do						\
     {						\
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
index b76858fc9..f80615db9 100644
--- a/libgloss/arm/syscalls.c
+++ b/libgloss/arm/syscalls.c
@@ -85,7 +85,7 @@ register char * stack_ptr asm ("sp");
 
 
 /* following is copied from libc/stdio/local.h to check std streams */
-extern void   _EXFUN(__sinit,(struct _reent *));
+extern void   __sinit (struct _reent *);
 #define CHECK_INIT(ptr) \
   do						\
     {						\
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 87dca10a1..8b50fe274 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -14,7 +14,7 @@
  */
 #include "glue.h"
 
-extern int  _EXFUN (outbyte, (char x));
+extern int  outbyte (char x);
 
 /*
  * write -- write bytes to the serial port. Ignore fd, since
diff --git a/libgloss/sparc_leon/asm-leon/clock.h b/libgloss/sparc_leon/asm-leon/clock.h
index 189e942e1..7e33ae4d0 100644
--- a/libgloss/sparc_leon/asm-leon/clock.h
+++ b/libgloss/sparc_leon/asm-leon/clock.h
@@ -30,8 +30,8 @@
 #include <asm-leon/param.h>
 
 #ifndef __ASSEMBLER__
-int _EXFUN (gettimeofday, (struct timeval * __p, void *__tz));
-int _EXFUN (settimeofday, (const struct timeval *, const struct timezone *));
+int gettimeofday (struct timeval * __p, void *__tz);
+int settimeofday (const struct timeval *, const struct timezone *);
 void do_gettimeofday (struct timeval *tv);
 #endif
 
diff --git a/libgloss/write.c b/libgloss/write.c
index 4b25cfce7..28b7ea37a 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -14,7 +14,7 @@
  */
 #include "glue.h"
 
-extern int  _EXFUN (outbyte, (char x));
+extern int  outbyte (char x);
 
 /*
  * write -- write bytes to the serial port. Ignore fd, since
diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
index b3788e218..62d2b1553 100644
--- a/newlib/libc/ctype/local.h
+++ b/newlib/libc/ctype/local.h
@@ -27,5 +27,5 @@
    to the requirements of the underlying OS. */
 #define _jp2uc(c) (c)
 #else
-wint_t _EXFUN (_jp2uc, (wint_t));
+wint_t _jp2uc (wint_t);
 #endif
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 2b844d558..c8ef218a1 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -57,17 +57,17 @@
  */
 
 static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, const __uint16_t *tblp));
+find_code_size (ucs2_t code, const __uint16_t *tblp);
 
 static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, const __uint16_t *tblp));
+find_code_speed (ucs2_t code, const __uint16_t *tblp);
 
 static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, const unsigned char *tblp));
+find_code_speed_8bit (ucs2_t code, const unsigned char *tblp);
 
 #ifdef _ICONV_ENABLE_EXTERNAL_CCS
 static const iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
+load_file (struct _reent *rptr, const char *name, int direction);
 #endif
 
 /*
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 8c3d19073..59f4f993d 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -36,8 +36,8 @@
 static int fake_data;
 
 static int 
-_EXFUN(find_encoding_name, (const char *searchee,
-                            const char **names));
+find_encoding_name (const char *searchee,
+                            const char **names);
 
 
 /*
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 3e2490088..e2737ed48 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -47,19 +47,10 @@
 #endif
 
 #ifdef _HAVE_STDC
-#ifdef __CYGWIN__
-#define	_EXFUN_NOTHROW(name, proto)	__cdecl name proto _NOTHROW
-#define	_EXFUN(name, proto)		__cdecl name proto
-#else
-#define	_EXFUN_NOTHROW(name, proto)	name proto _NOTHROW
-#define	_EXFUN(name, proto)		name proto
-#endif
 #ifndef _LONG_DOUBLE
 #define _LONG_DOUBLE long double
 #endif
 #else	
-#define	_EXFUN(name, proto)		name()
-#define	_EXFUN_NOTHROW(name, proto)	name()
 #define _LONG_DOUBLE double
 #endif
 
diff --git a/newlib/libc/include/alloca.h b/newlib/libc/include/alloca.h
index 2ea0fd9b3..5d3631891 100644
--- a/newlib/libc/include/alloca.h
+++ b/newlib/libc/include/alloca.h
@@ -15,7 +15,7 @@
 #ifdef __GNUC__
 #define alloca(size) __builtin_alloca(size)
 #else
-void * _EXFUN(alloca,(size_t));
+void * alloca (size_t);
 #endif
 
 #endif
diff --git a/newlib/libc/include/assert.h b/newlib/libc/include/assert.h
index 91bb040ca..b9e5e9b4a 100644
--- a/newlib/libc/include/assert.h
+++ b/newlib/libc/include/assert.h
@@ -36,10 +36,10 @@ extern "C" {
 # endif /* !__ASSERT_FUNC */
 #endif /* !NDEBUG */
 
-void _EXFUN(__assert, (const char *, int, const char *)
-	    _ATTRIBUTE ((__noreturn__)));
-void _EXFUN(__assert_func, (const char *, int, const char *, const char *)
-	    _ATTRIBUTE ((__noreturn__)));
+void __assert (const char *, int, const char *)
+	    _ATTRIBUTE ((__noreturn__));
+void __assert_func (const char *, int, const char *, const char *)
+	    _ATTRIBUTE ((__noreturn__));
 
 #if __STDC_VERSION__ >= 201112L && !defined __cplusplus
 # define static_assert _Static_assert
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 0d705e131..f74b3499b 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -10,27 +10,27 @@
 
 _BEGIN_STD_C
 
-int _EXFUN(isalnum, (int __c));
-int _EXFUN(isalpha, (int __c));
-int _EXFUN(iscntrl, (int __c));
-int _EXFUN(isdigit, (int __c));
-int _EXFUN(isgraph, (int __c));
-int _EXFUN(islower, (int __c));
-int _EXFUN(isprint, (int __c));
-int _EXFUN(ispunct, (int __c));
-int _EXFUN(isspace, (int __c));
-int _EXFUN(isupper, (int __c));
-int _EXFUN(isxdigit,(int __c));
-int _EXFUN(tolower, (int __c));
-int _EXFUN(toupper, (int __c));
+int isalnum (int __c);
+int isalpha (int __c);
+int iscntrl (int __c);
+int isdigit (int __c);
+int isgraph (int __c);
+int islower (int __c);
+int isprint (int __c);
+int ispunct (int __c);
+int isspace (int __c);
+int isupper (int __c);
+int isxdigit (int __c);
+int tolower (int __c);
+int toupper (int __c);
 
 #if __ISO_C_VISIBLE >= 1999
-int _EXFUN(isblank, (int __c));
+int isblank (int __c);
 #endif
 
 #if __MISC_VISIBLE || __XSI_VISIBLE
-int _EXFUN(isascii, (int __c));
-int _EXFUN(toascii, (int __c));
+int isascii (int __c);
+int toascii (int __c);
 #define _tolower(__c) ((unsigned char)(__c) - 'A' + 'a')
 #define _toupper(__c) ((unsigned char)(__c) - 'a' + 'A')
 #endif
diff --git a/newlib/libc/include/envlock.h b/newlib/libc/include/envlock.h
index 9bb6a813e..799cf7f9e 100644
--- a/newlib/libc/include/envlock.h
+++ b/newlib/libc/include/envlock.h
@@ -9,7 +9,7 @@
 #define ENV_LOCK __env_lock(reent_ptr)
 #define ENV_UNLOCK __env_unlock(reent_ptr)
 
-void _EXFUN(__env_lock,(struct _reent *reent));
-void _EXFUN(__env_unlock,(struct _reent *reent));
+void __env_lock (struct _reent *reent);
+void __env_unlock (struct _reent *reent);
 
 #endif /* _INCLUDE_ENVLOCK_H_ */
diff --git a/newlib/libc/include/getopt.h b/newlib/libc/include/getopt.h
index e12d253d4..9bced42e4 100644
--- a/newlib/libc/include/getopt.h
+++ b/newlib/libc/include/getopt.h
@@ -153,31 +153,25 @@ extern "C"
   extern int optopt;
 
   /* function prototypes */
-  int _EXFUN (getopt,
-	      (int __argc, char *const __argv[], const char *__optstring));
+  int getopt (int __argc, char *const __argv[], const char *__optstring);
 
-  int _EXFUN (getopt_long,
-	      (int __argc, char *const __argv[], const char *__shortopts,
-	       const struct option * __longopts, int *__longind));
+  int getopt_long (int __argc, char *const __argv[], const char *__shortopts,
+	       const struct option * __longopts, int *__longind);
 
-  int _EXFUN (getopt_long_only,
-	      (int __argc, char *const __argv[], const char *__shortopts,
-	       const struct option * __longopts, int *__longind));
+  int getopt_long_only (int __argc, char *const __argv[], const char *__shortopts,
+	       const struct option * __longopts, int *__longind);
 
 #ifdef __need_getopt_newlib
-  int _EXFUN (__getopt_r,
-	      (int __argc, char *const __argv[], const char *__optstring,
-	       struct getopt_data * __data));
+  int __getopt_r (int __argc, char *const __argv[], const char *__optstring,
+	       struct getopt_data * __data);
 
-  int _EXFUN (__getopt_long_r,
-	      (int __argc, char *const __argv[], const char *__shortopts,
+  int __getopt_long_r (int __argc, char *const __argv[], const char *__shortopts,
 	       const struct option * __longopts, int *__longind,
-	       struct getopt_data * __data));
+	       struct getopt_data * __data);
 
-  int _EXFUN (__getopt_long_only_r,
-	      (int __argc, char *const __argv[], const char *__shortopts,
+  int __getopt_long_only_r (int __argc, char *const __argv[], const char *__shortopts,
 	       const struct option * __longopts, int *__longind,
-	       struct getopt_data * __data));
+	       struct getopt_data * __data);
 #endif /* __need_getopt_newlib */
 
 #ifdef __cplusplus
diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
index e19f73d85..37feb882f 100644
--- a/newlib/libc/include/iconv.h
+++ b/newlib/libc/include/iconv.h
@@ -38,25 +38,25 @@ _BEGIN_STD_C
 
 #ifndef _REENT_ONLY
 iconv_t
-_EXFUN(iconv_open, (const char *, const char *));
+iconv_open (const char *, const char *);
 
 size_t
-_EXFUN(iconv, (iconv_t, char **__restrict, size_t *__restrict, 
-               char **__restrict, size_t *__restrict));
+iconv (iconv_t, char **__restrict, size_t *__restrict, 
+               char **__restrict, size_t *__restrict);
 
 int
-_EXFUN(iconv_close, (iconv_t));
+iconv_close (iconv_t);
 #endif
 
 iconv_t
-_EXFUN(_iconv_open_r, (struct _reent *, const char *, const char *));
+_iconv_open_r (struct _reent *, const char *, const char *);
 
 size_t
-_EXFUN(_iconv_r, (struct _reent *, iconv_t, const char **,
-                  size_t *, char **, size_t *));
+_iconv_r (struct _reent *, iconv_t, const char **,
+                  size_t *, char **, size_t *);
 
 int
-_EXFUN(_iconv_close_r, (struct _reent *, iconv_t));
+_iconv_close_r (struct _reent *, iconv_t);
 
 _END_STD_C
 
diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h
index 2c042848b..2d6421a4c 100644
--- a/newlib/libc/include/ieeefp.h
+++ b/newlib/libc/include/ieeefp.h
@@ -215,8 +215,8 @@ typedef int fp_rnd;
 #define FP_RP 2		/* Round up 			*/
 #define FP_RZ 3		/* Round to zero (trunate) 	*/
 
-fp_rnd _EXFUN(fpgetround,(void));
-fp_rnd _EXFUN(fpsetround, (fp_rnd));
+fp_rnd fpgetround (void);
+fp_rnd fpsetround (fp_rnd);
 
 /* EXCEPTIONS */
 
@@ -227,10 +227,10 @@ typedef int fp_except;
 #define FP_X_UFL 0x02	/* Underflow exception		*/
 #define FP_X_IMP 0x01	/* imprecise exception		*/
 
-fp_except _EXFUN(fpgetmask,(void));
-fp_except _EXFUN(fpsetmask,(fp_except));
-fp_except _EXFUN(fpgetsticky,(void));
-fp_except _EXFUN(fpsetsticky, (fp_except));
+fp_except fpgetmask (void);
+fp_except fpsetmask (fp_except);
+fp_except fpgetsticky (void);
+fp_except fpsetsticky (fp_except);
 
 /* INTEGER ROUNDING */
 
@@ -238,8 +238,8 @@ typedef int fp_rdi;
 #define FP_RDI_TOZ 0	/* Round to Zero 		*/
 #define FP_RDI_RD  1	/* Follow float mode		*/
 
-fp_rdi _EXFUN(fpgetroundtoi,(void));
-fp_rdi _EXFUN(fpsetroundtoi,(fp_rdi));
+fp_rdi fpgetroundtoi (void);
+fp_rdi fpsetroundtoi (fp_rdi);
 
 #define __IEEE_DBL_EXPBIAS 1023
 #define __IEEE_FLT_EXPBIAS 127
diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h
index 3c717c5b0..414b5aa18 100644
--- a/newlib/libc/include/libgen.h
+++ b/newlib/libc/include/libgen.h
@@ -26,8 +26,8 @@ extern "C" {
    sure here. */
 #undef basename
 #define basename __xpg_basename
-char      *_EXFUN(basename,     (char *)) __asm__(__ASMNAME("basename"));
-char      *_EXFUN(dirname,     (char *));
+char      *basename (char *) __asm__(__ASMNAME("basename"));
+char      *dirname (char *);
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index 8ba88a90c..d11eb00fb 100644
--- a/newlib/libc/include/locale.h
+++ b/newlib/libc/include/locale.h
@@ -68,8 +68,8 @@ struct lconv
 };
 
 struct _reent;
-char *_EXFUN(_setlocale_r,(struct _reent *, int, const char *));
-struct lconv *_EXFUN(_localeconv_r,(struct _reent *));
+char *_setlocale_r (struct _reent *, int, const char *);
+struct lconv *_localeconv_r (struct _reent *);
 
 struct __locale_t *_newlocale_r (struct _reent *, int, const char *,
 				 struct __locale_t *);
@@ -79,8 +79,8 @@ struct __locale_t *_uselocale_r (struct _reent *, struct __locale_t *);
 
 #ifndef _REENT_ONLY
 
-char *_EXFUN(setlocale,(int, const char *));
-struct lconv *_EXFUN(localeconv,(void));
+char *setlocale (int, const char *);
+struct lconv *localeconv (void);
 
 #if __POSIX_VISIBLE >= 200809
 locale_t newlocale (int, const char *, locale_t);
diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index 493eafd7e..3dee1c9ae 100644
--- a/newlib/libc/include/pthread.h
+++ b/newlib/libc/include/pthread.h
@@ -39,34 +39,32 @@ struct _pthread_cleanup_context {
 };
 
 /* Register Fork Handlers */
-int	_EXFUN(pthread_atfork,(void (*prepare)(void), void (*parent)(void),
-                   void (*child)(void)));
+int	pthread_atfork (void (*prepare)(void), void (*parent)(void),
+                   void (*child)(void));
           
 /* Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81 */
 
-int	_EXFUN(pthread_mutexattr_init, (pthread_mutexattr_t *__attr));
-int	_EXFUN(pthread_mutexattr_destroy, (pthread_mutexattr_t *__attr));
-int	_EXFUN(pthread_mutexattr_getpshared,
-		(const pthread_mutexattr_t *__attr, int  *__pshared));
-int	_EXFUN(pthread_mutexattr_setpshared,
-		(pthread_mutexattr_t *__attr, int __pshared));
+int	pthread_mutexattr_init (pthread_mutexattr_t *__attr);
+int	pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
+int	pthread_mutexattr_getpshared (const pthread_mutexattr_t *__attr,
+				      int  *__pshared);
+int	pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
+				      int __pshared);
 
 #if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
 
 /* Single UNIX Specification 2 Mutex Attributes types */
 
-int _EXFUN(pthread_mutexattr_gettype,
-		(const pthread_mutexattr_t *__attr, int *__kind));
-int _EXFUN(pthread_mutexattr_settype,
-		(pthread_mutexattr_t *__attr, int __kind));
+int pthread_mutexattr_gettype (const pthread_mutexattr_t *__attr, int *__kind);
+int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind);
 
 #endif
 
 /* Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87 */
 
-int	_EXFUN(pthread_mutex_init,
-	(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr));
-int	_EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
+int	pthread_mutex_init (pthread_mutex_t *__mutex,
+			    const pthread_mutexattr_t *__attr);
+int	pthread_mutex_destroy (pthread_mutex_t *__mutex);
 
 /* This is used to statically initialize a pthread_mutex_t. Example:
   
@@ -78,38 +76,36 @@ int	_EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
 /*  Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
     NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29 */
 
-int	_EXFUN(pthread_mutex_lock, (pthread_mutex_t *__mutex));
-int	_EXFUN(pthread_mutex_trylock, (pthread_mutex_t *__mutex));
-int	_EXFUN(pthread_mutex_unlock, (pthread_mutex_t *__mutex));
+int	pthread_mutex_lock (pthread_mutex_t *__mutex);
+int	pthread_mutex_trylock (pthread_mutex_t *__mutex);
+int	pthread_mutex_unlock (pthread_mutex_t *__mutex);
 
 #if defined(_POSIX_TIMEOUTS)
 
-int	_EXFUN(pthread_mutex_timedlock,
-	(pthread_mutex_t *__mutex, const struct timespec *__timeout));
+int	pthread_mutex_timedlock (pthread_mutex_t *__mutex,
+				 const struct timespec *__timeout);
 
 #endif /* _POSIX_TIMEOUTS */
 
 /* Condition Variable Initialization Attributes, P1003.1c/Draft 10, p. 96 */
  
-int	_EXFUN(pthread_condattr_init, (pthread_condattr_t *__attr));
-int	_EXFUN(pthread_condattr_destroy, (pthread_condattr_t *__attr));
-
-int	_EXFUN(pthread_condattr_getclock,
-		(const pthread_condattr_t *__restrict __attr,
-              clockid_t *__restrict __clock_id));
-int	_EXFUN(pthread_condattr_setclock,
-		(pthread_condattr_t *__attr, clockid_t __clock_id));
-
-int	_EXFUN(pthread_condattr_getpshared,
-		(const pthread_condattr_t *__attr, int *__pshared));
-int	_EXFUN(pthread_condattr_setpshared,
-		(pthread_condattr_t *__attr, int __pshared));
+int	pthread_condattr_init (pthread_condattr_t *__attr);
+int	pthread_condattr_destroy (pthread_condattr_t *__attr);
+
+int	pthread_condattr_getclock (const pthread_condattr_t *__restrict __attr,
+				   clockid_t *__restrict __clock_id);
+int	pthread_condattr_setclock (pthread_condattr_t *__attr,
+				   clockid_t __clock_id);
+
+int	pthread_condattr_getpshared (const pthread_condattr_t *__attr,
+				     int *__pshared);
+int	pthread_condattr_setpshared (pthread_condattr_t *__attr, int __pshared);
  
 /* Initializing and Destroying a Condition Variable, P1003.1c/Draft 10, p. 87 */
  
-int	_EXFUN(pthread_cond_init,
-	(pthread_cond_t *__cond, const pthread_condattr_t *__attr));
-int	_EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
+int	pthread_cond_init (pthread_cond_t *__cond,
+			   const pthread_condattr_t *__attr);
+int	pthread_cond_destroy (pthread_cond_t *__mutex);
  
 /* This is used to statically initialize a pthread_cond_t. Example:
   
@@ -120,53 +116,50 @@ int	_EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
  
 /* Broadcasting and Signaling a Condition, P1003.1c/Draft 10, p. 101 */
  
-int	_EXFUN(pthread_cond_signal, (pthread_cond_t *__cond));
-int	_EXFUN(pthread_cond_broadcast, (pthread_cond_t *__cond));
+int	pthread_cond_signal (pthread_cond_t *__cond);
+int	pthread_cond_broadcast (pthread_cond_t *__cond);
  
 /* Waiting on a Condition, P1003.1c/Draft 10, p. 105 */
  
-int	_EXFUN(pthread_cond_wait,
-	(pthread_cond_t *__cond, pthread_mutex_t *__mutex));
+int	pthread_cond_wait (pthread_cond_t *__cond, pthread_mutex_t *__mutex);
  
-int	_EXFUN(pthread_cond_timedwait,
-		(pthread_cond_t *__cond, pthread_mutex_t *__mutex,
-		const struct timespec *__abstime));
+int	pthread_cond_timedwait (pthread_cond_t *__cond,
+				pthread_mutex_t *__mutex,
+				const struct timespec *__abstime);
  
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 
 /* Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120 */
 
-int	_EXFUN(pthread_attr_setscope,
-		(pthread_attr_t *__attr, int __contentionscope));
-int	_EXFUN(pthread_attr_getscope,
-	(const pthread_attr_t *__attr, int *__contentionscope));
-int	_EXFUN(pthread_attr_setinheritsched,
-	(pthread_attr_t *__attr, int __inheritsched));
-int	_EXFUN(pthread_attr_getinheritsched,
-	(const pthread_attr_t *__attr, int *__inheritsched));
-int	_EXFUN(pthread_attr_setschedpolicy,
-	(pthread_attr_t *__attr, int __policy));
-int	_EXFUN(pthread_attr_getschedpolicy,
-	(const pthread_attr_t *__attr, int *__policy));
+int	pthread_attr_setscope (pthread_attr_t *__attr, int __contentionscope);
+int	pthread_attr_getscope (const pthread_attr_t *__attr,
+			       int *__contentionscope);
+int	pthread_attr_setinheritsched (pthread_attr_t *__attr,
+				      int __inheritsched);
+int	pthread_attr_getinheritsched (const pthread_attr_t *__attr,
+				      int *__inheritsched);
+int	pthread_attr_setschedpolicy (pthread_attr_t *__attr, int __policy);
+int	pthread_attr_getschedpolicy (const pthread_attr_t *__attr,
+				     int *__policy);
 
 #endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
 
-int	_EXFUN(pthread_attr_setschedparam,
-	(pthread_attr_t *__attr, const struct sched_param *__param));
-int	_EXFUN(pthread_attr_getschedparam,
-	(const pthread_attr_t *__attr, struct sched_param *__param));
+int	pthread_attr_setschedparam (pthread_attr_t *__attr,
+				    const struct sched_param *__param);
+int	pthread_attr_getschedparam (const pthread_attr_t *__attr,
+				    struct sched_param *__param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 
 /* Dynamic Thread Scheduling Parameters Access, P1003.1c/Draft 10, p. 124 */
 
-int	_EXFUN(pthread_getschedparam,
-	(pthread_t __pthread, int *__policy, struct sched_param *__param));
-int	_EXFUN(pthread_setschedparam,
-	(pthread_t __pthread, int __policy, struct sched_param *__param));
+int	pthread_getschedparam (pthread_t __pthread, int *__policy,
+			       struct sched_param *__param);
+int	pthread_setschedparam (pthread_t __pthread, int __policy,
+			       struct sched_param *__param);
 
 /* Set Scheduling Priority of a Thread */
-int	_EXFUN(pthread_setschedprio, (pthread_t thread, int prio));
+int	pthread_setschedprio (pthread_t thread, int prio);
 
 #endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
 
@@ -180,14 +173,14 @@ int	pthread_setname_np(pthread_t, const char *) __nonnull((2));
 
 /* Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128 */
  
-int	_EXFUN(pthread_mutexattr_setprotocol,
-	(pthread_mutexattr_t *__attr, int __protocol));
-int	_EXFUN(pthread_mutexattr_getprotocol,
-	(const pthread_mutexattr_t *__attr, int *__protocol));
-int	_EXFUN(pthread_mutexattr_setprioceiling,
-	(pthread_mutexattr_t *__attr, int __prioceiling));
-int	_EXFUN(pthread_mutexattr_getprioceiling,
-	(const pthread_mutexattr_t *__attr, int *__prioceiling));
+int	pthread_mutexattr_setprotocol (pthread_mutexattr_t *__attr,
+				       int __protocol);
+int	pthread_mutexattr_getprotocol (const pthread_mutexattr_t *__attr,
+				       int *__protocol);
+int	pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
+					  int __prioceiling);
+int	pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *__attr,
+					  int *__prioceiling);
 
 #endif /* _POSIX_THREAD_PRIO_INHERIT || _POSIX_THREAD_PRIO_PROTECT */
 
@@ -195,37 +188,33 @@ int	_EXFUN(pthread_mutexattr_getprioceiling,
 
 /* Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131 */
 
-int	_EXFUN(pthread_mutex_setprioceiling,
-	(pthread_mutex_t *__mutex, int __prioceiling, int *__old_ceiling));
-int	_EXFUN(pthread_mutex_getprioceiling,
-	(pthread_mutex_t *__mutex, int *__prioceiling));
+int	pthread_mutex_setprioceiling (pthread_mutex_t *__mutex,
+				      int __prioceiling, int *__old_ceiling);
+int	pthread_mutex_getprioceiling (pthread_mutex_t *__mutex,
+				      int *__prioceiling);
 
 #endif /* _POSIX_THREAD_PRIO_PROTECT */
 
 /* Thread Creation Attributes, P1003.1c/Draft 10, p, 140 */
 
-int	_EXFUN(pthread_attr_init, (pthread_attr_t *__attr));
-int	_EXFUN(pthread_attr_destroy, (pthread_attr_t *__attr));
-int	_EXFUN(pthread_attr_setstack, (pthread_attr_t *attr,
-	void *__stackaddr, size_t __stacksize));
-int	_EXFUN(pthread_attr_getstack, (const pthread_attr_t *attr,
-	void **__stackaddr, size_t *__stacksize));
-int	_EXFUN(pthread_attr_getstacksize,
-	(const pthread_attr_t *__attr, size_t *__stacksize));
-int	_EXFUN(pthread_attr_setstacksize,
-	(pthread_attr_t *__attr, size_t __stacksize));
-int	_EXFUN(pthread_attr_getstackaddr,
-	(const pthread_attr_t *__attr, void **__stackaddr));
-int	_EXFUN(pthread_attr_setstackaddr,
-	(pthread_attr_t  *__attr, void *__stackaddr));
-int	_EXFUN(pthread_attr_getdetachstate,
-	(const pthread_attr_t *__attr, int *__detachstate));
-int	_EXFUN(pthread_attr_setdetachstate,
-	(pthread_attr_t *__attr, int __detachstate));
-int	_EXFUN(pthread_attr_getguardsize,
-	(const pthread_attr_t *__attr, size_t *__guardsize));
-int	_EXFUN(pthread_attr_setguardsize,
-	(pthread_attr_t *__attr, size_t __guardsize));
+int	pthread_attr_init (pthread_attr_t *__attr);
+int	pthread_attr_destroy (pthread_attr_t *__attr);
+int	pthread_attr_setstack (pthread_attr_t *attr,
+	void *__stackaddr, size_t __stacksize);
+int	pthread_attr_getstack (const pthread_attr_t *attr,
+	void **__stackaddr, size_t *__stacksize);
+int	pthread_attr_getstacksize (const pthread_attr_t *__attr,
+				   size_t *__stacksize);
+int	pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
+int	pthread_attr_getstackaddr (const pthread_attr_t *__attr,
+				   void **__stackaddr);
+int	pthread_attr_setstackaddr (pthread_attr_t  *__attr, void *__stackaddr);
+int	pthread_attr_getdetachstate (const pthread_attr_t *__attr,
+				     int *__detachstate);
+int	pthread_attr_setdetachstate (pthread_attr_t *__attr, int __detachstate);
+int	pthread_attr_getguardsize (const pthread_attr_t *__attr,
+				   size_t *__guardsize);
+int	pthread_attr_setguardsize (pthread_attr_t *__attr, size_t __guardsize);
 
 /* POSIX thread APIs beyond the POSIX standard but provided 
  * in GNU/Linux. They may be provided by other OSes for
@@ -233,59 +222,55 @@ int	_EXFUN(pthread_attr_setguardsize,
  */
 #if __GNU_VISIBLE
 #if defined(__rtems__) 
-int	_EXFUN(pthread_attr_setaffinity_np,
-	(pthread_attr_t *__attr, size_t __cpusetsize, 
-	const cpu_set_t *__cpuset));
-int 	_EXFUN(pthread_attr_getaffinity_np,
-	(const pthread_attr_t *__attr, size_t __cpusetsize,
-	cpu_set_t *__cpuset));
-
-int	_EXFUN(pthread_setaffinity_np,
-	(pthread_t __id, size_t __cpusetsize, const cpu_set_t *__cpuset));
-int	_EXFUN(pthread_getaffinity_np,
-	(const pthread_t __id, size_t __cpusetsize, cpu_set_t *__cpuset));
-
-int	_EXFUN(pthread_getattr_np,
-	(pthread_t __id, pthread_attr_t *__attr));
+int	pthread_attr_setaffinity_np (pthread_attr_t *__attr,
+				     size_t __cpusetsize,
+				     const cpu_set_t *__cpuset);
+int 	pthread_attr_getaffinity_np (const pthread_attr_t *__attr,
+				     size_t __cpusetsize, cpu_set_t *__cpuset);
+
+int	pthread_setaffinity_np (pthread_t __id, size_t __cpusetsize,
+				const cpu_set_t *__cpuset);
+int	pthread_getaffinity_np (const pthread_t __id, size_t __cpusetsize,
+				cpu_set_t *__cpuset);
+
+int	pthread_getattr_np (pthread_t __id, pthread_attr_t *__attr);
 #endif /* defined(__rtems__) */
 #endif /* __GNU_VISIBLE */
 
 /* Thread Creation, P1003.1c/Draft 10, p. 144 */
 
-int	_EXFUN(pthread_create,
-	(pthread_t *__pthread, const pthread_attr_t  *__attr,
-	void *(*__start_routine)( void * ), void *__arg));
+int	pthread_create (pthread_t *__pthread, const pthread_attr_t  *__attr,
+			void *(*__start_routine)(void *), void *__arg);
 
 /* Wait for Thread Termination, P1003.1c/Draft 10, p. 147 */
 
-int	_EXFUN(pthread_join, (pthread_t __pthread, void **__value_ptr));
+int	pthread_join (pthread_t __pthread, void **__value_ptr);
 
 /* Detaching a Thread, P1003.1c/Draft 10, p. 149 */
 
-int	_EXFUN(pthread_detach, (pthread_t __pthread));
+int	pthread_detach (pthread_t __pthread);
 
 /* Thread Termination, p1003.1c/Draft 10, p. 150 */
 
-void	_EXFUN(pthread_exit, (void *__value_ptr)) __dead2;
+void	pthread_exit (void *__value_ptr) __dead2;
 
 /* Get Calling Thread's ID, p1003.1c/Draft 10, p. XXX */
 
-pthread_t	_EXFUN(pthread_self, (void));
+pthread_t	pthread_self (void);
 
 /* Compare Thread IDs, p1003.1c/Draft 10, p. 153 */
 
-int	_EXFUN(pthread_equal, (pthread_t __t1, pthread_t __t2));
+int	pthread_equal (pthread_t __t1, pthread_t __t2);
 
 /* Retrieve ID of a Thread's CPU Time Clock */
-int	_EXFUN(pthread_getcpuclockid,
-		(pthread_t thread, clockid_t *clock_id));
+int	pthread_getcpuclockid (pthread_t thread, clockid_t *clock_id);
 
 /* Get/Set Current Thread's Concurrency Level */
-int	_EXFUN(pthread_setconcurrency, (int new_level));
-int	_EXFUN(pthread_getconcurrency, (void));
+int	pthread_setconcurrency (int new_level);
+int	pthread_getconcurrency (void);
 
 #if __BSD_VISIBLE || __GNU_VISIBLE
-void	_EXFUN(pthread_yield, (void));
+void	pthread_yield (void);
 #endif
 
 /* Dynamic Package Initialization */
@@ -298,23 +283,22 @@ void	_EXFUN(pthread_yield, (void));
  
 #define PTHREAD_ONCE_INIT _PTHREAD_ONCE_INIT
  
-int	_EXFUN(pthread_once,
-	(pthread_once_t *__once_control, void (*__init_routine)(void)));
+int	pthread_once (pthread_once_t *__once_control,
+		      void (*__init_routine)(void));
 
 /* Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163 */
 
-int	_EXFUN(pthread_key_create,
-	(pthread_key_t *__key, void (*__destructor)( void * )));
+int	pthread_key_create (pthread_key_t *__key,
+			    void (*__destructor)(void *));
 
 /* Thread-Specific Data Management, P1003.1c/Draft 10, p. 165 */
 
-int	_EXFUN(pthread_setspecific,
-	(pthread_key_t __key, const void *__value));
-void *	_EXFUN(pthread_getspecific, (pthread_key_t __key));
+int	pthread_setspecific (pthread_key_t __key, const void *__value);
+void *	pthread_getspecific (pthread_key_t __key);
 
 /* Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167 */
 
-int	_EXFUN(pthread_key_delete, (pthread_key_t __key));
+int	pthread_key_delete (pthread_key_t __key);
 
 /* Execution of a Thread, P1003.1c/Draft 10, p. 181 */
 
@@ -326,23 +310,21 @@ int	_EXFUN(pthread_key_delete, (pthread_key_t __key));
 
 #define PTHREAD_CANCELED ((void *) -1)
 
-int	_EXFUN(pthread_cancel, (pthread_t __pthread));
+int	pthread_cancel (pthread_t __pthread);
 
 /* Setting Cancelability State, P1003.1c/Draft 10, p. 183 */
 
-int	_EXFUN(pthread_setcancelstate, (int __state, int *__oldstate));
-int	_EXFUN(pthread_setcanceltype, (int __type, int *__oldtype));
-void 	_EXFUN(pthread_testcancel, (void));
+int	pthread_setcancelstate (int __state, int *__oldstate);
+int	pthread_setcanceltype (int __type, int *__oldtype);
+void 	pthread_testcancel (void);
 
 /* Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184 */
 
-void	_EXFUN(_pthread_cleanup_push,
-	(struct _pthread_cleanup_context *_context,
-	void (*_routine)(void *), void *_arg));
+void	_pthread_cleanup_push (struct _pthread_cleanup_context *_context,
+			       void (*_routine)(void *), void *_arg);
 
-void	_EXFUN(_pthread_cleanup_pop,
-	(struct _pthread_cleanup_context *_context,
-	int _execute));
+void	_pthread_cleanup_pop (struct _pthread_cleanup_context *_context,
+			      int _execute);
 
 /* It is intentional to open and close the scope in two different macros */
 #define pthread_cleanup_push(_routine, _arg) \
@@ -355,13 +337,11 @@ void	_EXFUN(_pthread_cleanup_pop,
   } while (0)
 
 #if __GNU_VISIBLE
-void	_EXFUN(_pthread_cleanup_push_defer,
-	(struct _pthread_cleanup_context *_context,
-	void (*_routine)(void *), void *_arg));
+void	_pthread_cleanup_push_defer (struct _pthread_cleanup_context *_context,
+				     void (*_routine)(void *), void *_arg);
 
-void	_EXFUN(_pthread_cleanup_pop_restore,
-	(struct _pthread_cleanup_context *_context,
-	int _execute));
+void	_pthread_cleanup_pop_restore (struct _pthread_cleanup_context *_context,
+				      int _execute);
 
 /* It is intentional to open and close the scope in two different macros */
 #define pthread_cleanup_push_defer_np(_routine, _arg) \
@@ -378,8 +358,7 @@ void	_EXFUN(_pthread_cleanup_pop_restore,
  
 /* Accessing a Thread CPU-time Clock, P1003.4b/D8, p. 58 */
  
-int	_EXFUN(pthread_getcpuclockid,
-	(pthread_t __pthread_id, clockid_t *__clock_id));
+int	pthread_getcpuclockid (pthread_t __pthread_id, clockid_t *__clock_id);
  
 #endif /* defined(_POSIX_THREAD_CPUTIME) */
 
@@ -388,31 +367,30 @@ int	_EXFUN(pthread_getcpuclockid,
 
 #if defined(_POSIX_BARRIERS)
 
-int	_EXFUN(pthread_barrierattr_init, (pthread_barrierattr_t *__attr));
-int	_EXFUN(pthread_barrierattr_destroy, (pthread_barrierattr_t *__attr));
-int	_EXFUN(pthread_barrierattr_getpshared,
-	(const pthread_barrierattr_t *__attr, int *__pshared));
-int	_EXFUN(pthread_barrierattr_setpshared,
-	(pthread_barrierattr_t *__attr, int __pshared));
+int	pthread_barrierattr_init (pthread_barrierattr_t *__attr);
+int	pthread_barrierattr_destroy (pthread_barrierattr_t *__attr);
+int	pthread_barrierattr_getpshared (const pthread_barrierattr_t *__attr,
+					int *__pshared);
+int	pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
+					int __pshared);
 
 #define PTHREAD_BARRIER_SERIAL_THREAD -1
 
-int	_EXFUN(pthread_barrier_init,
-	(pthread_barrier_t *__barrier,
-	const pthread_barrierattr_t *__attr, unsigned __count));
-int	_EXFUN(pthread_barrier_destroy, (pthread_barrier_t *__barrier));
-int	_EXFUN(pthread_barrier_wait,(pthread_barrier_t *__barrier));
+int	pthread_barrier_init (pthread_barrier_t *__barrier,
+			      const pthread_barrierattr_t *__attr,
+			      unsigned __count);
+int	pthread_barrier_destroy (pthread_barrier_t *__barrier);
+int	pthread_barrier_wait (pthread_barrier_t *__barrier);
 
 #endif /* defined(_POSIX_BARRIERS) */
 
 #if defined(_POSIX_SPIN_LOCKS)
 
-int	_EXFUN(pthread_spin_init,
-	(pthread_spinlock_t *__spinlock, int __pshared));
-int	_EXFUN(pthread_spin_destroy, (pthread_spinlock_t *__spinlock));
-int	_EXFUN(pthread_spin_lock, (pthread_spinlock_t *__spinlock));
-int	_EXFUN(pthread_spin_trylock, (pthread_spinlock_t *__spinlock));
-int	_EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
+int	pthread_spin_init (pthread_spinlock_t *__spinlock, int __pshared);
+int	pthread_spin_destroy (pthread_spinlock_t *__spinlock);
+int	pthread_spin_lock (pthread_spinlock_t *__spinlock);
+int	pthread_spin_trylock (pthread_spinlock_t *__spinlock);
+int	pthread_spin_unlock (pthread_spinlock_t *__spinlock);
 
 #endif /* defined(_POSIX_SPIN_LOCKS) */
 
@@ -425,25 +403,25 @@ int	_EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
 
 #define PTHREAD_RWLOCK_INITIALIZER _PTHREAD_RWLOCK_INITIALIZER
 
-int	_EXFUN(pthread_rwlockattr_init, (pthread_rwlockattr_t *__attr));
-int	_EXFUN(pthread_rwlockattr_destroy, (pthread_rwlockattr_t *__attr));
-int	_EXFUN(pthread_rwlockattr_getpshared,
-	(const pthread_rwlockattr_t *__attr, int *__pshared));
-int	_EXFUN(pthread_rwlockattr_setpshared,
-	(pthread_rwlockattr_t *__attr, int __pshared));
-
-int	_EXFUN(pthread_rwlock_init,
-	(pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr));
-int	_EXFUN(pthread_rwlock_destroy, (pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_rdlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_tryrdlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_timedrdlock,
-        (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
-int	_EXFUN(pthread_rwlock_unlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_wrlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_trywrlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_timedwrlock,
-        (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
+int	pthread_rwlockattr_init (pthread_rwlockattr_t *__attr);
+int	pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr);
+int	pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__attr,
+				       int *__pshared);
+int	pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
+				       int __pshared);
+
+int	pthread_rwlock_init (pthread_rwlock_t *__rwlock,
+			     const pthread_rwlockattr_t *__attr);
+int	pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_timedrdlock (pthread_rwlock_t *__rwlock,
+				    const struct timespec *__abstime);
+int	pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_timedwrlock (pthread_rwlock_t *__rwlock,
+				    const struct timespec *__abstime);
 
 #endif /* defined(_POSIX_READER_WRITER_LOCKS) */
 
diff --git a/newlib/libc/include/rpc/xdr.h b/newlib/libc/include/rpc/xdr.h
index bda8e9926..139e0c7ce 100644
--- a/newlib/libc/include/rpc/xdr.h
+++ b/newlib/libc/include/rpc/xdr.h
@@ -292,51 +292,51 @@ struct xdr_discrim
 /*
  * These are the "generic" xdr routines.
  */
-extern bool_t _EXFUN (xdr_void, (void));
-extern bool_t _EXFUN (xdr_short, (XDR *, short *));
-extern bool_t _EXFUN (xdr_u_short, (XDR *, u_short *));
-extern bool_t _EXFUN (xdr_int, (XDR *, int *));
-extern bool_t _EXFUN (xdr_u_int, (XDR *, u_int *));
-extern bool_t _EXFUN (xdr_long, (XDR *, long *));
-extern bool_t _EXFUN (xdr_u_long, (XDR *, u_long *));
-extern bool_t _EXFUN (xdr_int8_t, (XDR *, int8_t *));
-extern bool_t _EXFUN (xdr_uint8_t, (XDR *, uint8_t *));
-extern bool_t _EXFUN (xdr_u_int8_t, (XDR *, u_int8_t *));
-extern bool_t _EXFUN (xdr_int16_t, (XDR *, int16_t *));
-extern bool_t _EXFUN (xdr_uint16_t, (XDR *, uint16_t *));
-extern bool_t _EXFUN (xdr_u_int16_t, (XDR *, u_int16_t *));
-extern bool_t _EXFUN (xdr_int32_t, (XDR *, int32_t *));
-extern bool_t _EXFUN (xdr_uint32_t, (XDR *, uint32_t *));
-extern bool_t _EXFUN (xdr_u_int32_t, (XDR *, u_int32_t *));
+extern bool_t xdr_void (void);
+extern bool_t xdr_short (XDR *, short *);
+extern bool_t xdr_u_short (XDR *, u_short *);
+extern bool_t xdr_int (XDR *, int *);
+extern bool_t xdr_u_int (XDR *, u_int *);
+extern bool_t xdr_long (XDR *, long *);
+extern bool_t xdr_u_long (XDR *, u_long *);
+extern bool_t xdr_int8_t (XDR *, int8_t *);
+extern bool_t xdr_uint8_t (XDR *, uint8_t *);
+extern bool_t xdr_u_int8_t (XDR *, u_int8_t *);
+extern bool_t xdr_int16_t (XDR *, int16_t *);
+extern bool_t xdr_uint16_t (XDR *, uint16_t *);
+extern bool_t xdr_u_int16_t (XDR *, u_int16_t *);
+extern bool_t xdr_int32_t (XDR *, int32_t *);
+extern bool_t xdr_uint32_t (XDR *, uint32_t *);
+extern bool_t xdr_u_int32_t (XDR *, u_int32_t *);
 #if defined(___int64_t_defined)
-extern bool_t _EXFUN (xdr_int64_t, (XDR *, int64_t *));
-extern bool_t _EXFUN (xdr_uint64_t, (XDR *, uint64_t *));
-extern bool_t _EXFUN (xdr_u_int64_t, (XDR *, u_int64_t *));
+extern bool_t xdr_int64_t (XDR *, int64_t *);
+extern bool_t xdr_uint64_t (XDR *, uint64_t *);
+extern bool_t xdr_u_int64_t (XDR *, u_int64_t *);
 #endif /* ___int64_t_defined */
-extern bool_t _EXFUN (xdr_bool, (XDR *, bool_t *));
-extern bool_t _EXFUN (xdr_enum, (XDR *, enum_t *));
-extern bool_t _EXFUN (xdr_array, (XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_bytes, (XDR *, char **, u_int *, u_int));
-extern bool_t _EXFUN (xdr_opaque, (XDR *, char *, u_int));
-extern bool_t _EXFUN (xdr_string, (XDR *, char **, u_int));
-extern bool_t _EXFUN (xdr_union, (XDR *, enum_t *, char *,
-                                  const struct xdr_discrim *, xdrproc_t));
-extern bool_t _EXFUN (xdr_char, (XDR *, char *));
-extern bool_t _EXFUN (xdr_u_char, (XDR *, u_char *));
-extern bool_t _EXFUN (xdr_vector, (XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_float, (XDR *, float *));
-extern bool_t _EXFUN (xdr_double, (XDR *, double *));
-/* extern bool_t _EXFUN (xdr_quadruple, (XDR *, long double *)); */
-extern bool_t _EXFUN (xdr_reference, (XDR *, char **, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_pointer, (XDR *, char **, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_wrapstring, (XDR *, char **));
+extern bool_t xdr_bool (XDR *, bool_t *);
+extern bool_t xdr_enum (XDR *, enum_t *);
+extern bool_t xdr_array (XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_bytes (XDR *, char **, u_int *, u_int);
+extern bool_t xdr_opaque (XDR *, char *, u_int);
+extern bool_t xdr_string (XDR *, char **, u_int);
+extern bool_t xdr_union (XDR *, enum_t *, char *,
+                                  const struct xdr_discrim *, xdrproc_t);
+extern bool_t xdr_char (XDR *, char *);
+extern bool_t xdr_u_char (XDR *, u_char *);
+extern bool_t xdr_vector (XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_float (XDR *, float *);
+extern bool_t xdr_double (XDR *, double *);
+/* extern bool_t xdr_quadruple (XDR *, long double *); */
+extern bool_t xdr_reference (XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_pointer (XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_wrapstring (XDR *, char **);
 #if defined(___int64_t_defined)
-extern bool_t _EXFUN (xdr_hyper, (XDR *, quad_t *));
-extern bool_t _EXFUN (xdr_u_hyper, (XDR *, u_quad_t *));
-extern bool_t _EXFUN (xdr_longlong_t, (XDR *, quad_t *));
-extern bool_t _EXFUN (xdr_u_longlong_t, (XDR *, u_quad_t *));
+extern bool_t xdr_hyper (XDR *, quad_t *);
+extern bool_t xdr_u_hyper (XDR *, u_quad_t *);
+extern bool_t xdr_longlong_t (XDR *, quad_t *);
+extern bool_t xdr_u_longlong_t (XDR *, u_quad_t *);
 #endif /* ___int64_t_defined */
-extern u_long _EXFUN (xdr_sizeof, (xdrproc_t, void *));
+extern u_long xdr_sizeof (xdrproc_t, void *);
 
 /*
  * Common opaque bytes objects used by many rpc protocols;
@@ -349,7 +349,7 @@ struct netobj
   char *n_bytes;
 };
 typedef struct netobj netobj;
-extern bool_t _EXFUN (xdr_netobj, (XDR *, struct netobj *));
+extern bool_t xdr_netobj (XDR *, struct netobj *);
 
 /*
  * These are the public routines for the various implementations of
@@ -357,30 +357,30 @@ extern bool_t _EXFUN (xdr_netobj, (XDR *, struct netobj *));
  */
 
 /* XDR using memory buffers */
-extern void _EXFUN (xdrmem_create, (XDR *, char *, u_int, enum xdr_op));
+extern void xdrmem_create (XDR *, char *, u_int, enum xdr_op);
 
 /* XDR using stdio library */
 #if defined(_STDIO_H_)
-extern void _EXFUN (xdrstdio_create, (XDR *, FILE *, enum xdr_op));
+extern void xdrstdio_create (XDR *, FILE *, enum xdr_op);
 #endif
 
 /* XDR pseudo records for tcp */
-extern void _EXFUN (xdrrec_create, (XDR *, u_int, u_int, void *,
+extern void xdrrec_create (XDR *, u_int, u_int, void *,
                                     int (*) (void *, void *, int),
-                                    int (*) (void *, void *, int)));
+                                    int (*) (void *, void *, int));
 
 /* make end of xdr record */
-extern bool_t _EXFUN (xdrrec_endofrecord, (XDR *, bool_t));
+extern bool_t xdrrec_endofrecord (XDR *, bool_t);
 
 /* move to beginning of next record */
-extern bool_t _EXFUN (xdrrec_skiprecord, (XDR *));
+extern bool_t xdrrec_skiprecord (XDR *);
 
 /* true if no more input */
-extern bool_t _EXFUN (xdrrec_eof, (XDR *));
-extern u_int _EXFUN (xdrrec_readbytes, (XDR *, caddr_t, u_int));
+extern bool_t xdrrec_eof (XDR *);
+extern u_int xdrrec_readbytes (XDR *, caddr_t, u_int);
 
 /* free memory buffers for xdr */
-extern void _EXFUN (xdr_free, (xdrproc_t, void *));
+extern void xdr_free (xdrproc_t, void *);
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/setjmp.h b/newlib/libc/include/setjmp.h
index 521eac5a1..a2830b275 100644
--- a/newlib/libc/include/setjmp.h
+++ b/newlib/libc/include/setjmp.h
@@ -12,12 +12,12 @@
 _BEGIN_STD_C
 
 #ifdef __GNUC__
-void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval))
+void	longjmp (jmp_buf __jmpb, int __retval)
 			__attribute__ ((__noreturn__));
 #else
-void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
+void	longjmp (jmp_buf __jmpb, int __retval);
 #endif
-int	_EXFUN(setjmp,(jmp_buf __jmpb));
+int	setjmp (jmp_buf __jmpb);
 
 _END_STD_C
 
diff --git a/newlib/libc/include/signal.h b/newlib/libc/include/signal.h
index 0324ae71a..23a9863e6 100644
--- a/newlib/libc/include/signal.h
+++ b/newlib/libc/include/signal.h
@@ -21,13 +21,13 @@ typedef _sig_func_ptr sighandler_t;	/* glibc naming */
 
 struct _reent;
 
-_sig_func_ptr _EXFUN(_signal_r, (struct _reent *, int, _sig_func_ptr));
-int	_EXFUN(_raise_r, (struct _reent *, int));
+_sig_func_ptr _signal_r (struct _reent *, int, _sig_func_ptr);
+int	_raise_r (struct _reent *, int);
 
 #ifndef _REENT_ONLY
-_sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
-int	_EXFUN(raise, (int));
-void	_EXFUN(psignal, (int, const char *));
+_sig_func_ptr signal (int, _sig_func_ptr);
+int	raise (int);
+void	psignal (int, const char *);
 #endif
 
 _END_STD_C
diff --git a/newlib/libc/include/spawn.h b/newlib/libc/include/spawn.h
index 5a6692f11..d172177b1 100644
--- a/newlib/libc/include/spawn.h
+++ b/newlib/libc/include/spawn.h
@@ -53,67 +53,52 @@ _BEGIN_STD_C
  * XXX both arrays should be __restrict, but this does not work when GCC
  * is invoked with -std=c99.
  */
-int _EXFUN(posix_spawn, (pid_t *  __restrict, const char * __restrict,
+int posix_spawn (pid_t *  __restrict, const char * __restrict,
 	const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-	char * const [], char * const [])
-);
-int _EXFUN(posix_spawnp, (pid_t * __restrict, const char * __restrict,
+	char * const [], char * const []);
+int posix_spawnp (pid_t * __restrict, const char * __restrict,
 	const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-	char * const [], char * const [])
-);
+	char * const [], char * const []);
 
 /*
  * File descriptor actions
  */
-int _EXFUN(posix_spawn_file_actions_init, (posix_spawn_file_actions_t *));
-int _EXFUN(posix_spawn_file_actions_destroy, (posix_spawn_file_actions_t *));
+int posix_spawn_file_actions_init (posix_spawn_file_actions_t *);
+int posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *);
 
-int _EXFUN(posix_spawn_file_actions_addopen,
-	(posix_spawn_file_actions_t * __restrict, int, const char * __restrict, int, mode_t)
-);
-int _EXFUN(posix_spawn_file_actions_adddup2,
-	(posix_spawn_file_actions_t *, int, int)
-);
-int _EXFUN(posix_spawn_file_actions_addclose,
-	(posix_spawn_file_actions_t *, int)
-);
+int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t * __restrict,
+				      int, const char * __restrict, int, mode_t);
+int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *, int, int);
+int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *, int);
 
 /*
  * Spawn attributes
  */
-int _EXFUN(posix_spawnattr_init, (posix_spawnattr_t *));
-int _EXFUN(posix_spawnattr_destroy, (posix_spawnattr_t *));
+int posix_spawnattr_init (posix_spawnattr_t *);
+int posix_spawnattr_destroy (posix_spawnattr_t *);
 
-int _EXFUN(posix_spawnattr_getflags,
-	(const posix_spawnattr_t * __restrict, short * __restrict)
-);
-int _EXFUN(posix_spawnattr_getpgroup,
-	(const posix_spawnattr_t * __restrict, pid_t * __restrict));
-int _EXFUN(posix_spawnattr_getschedparam,
-	(const posix_spawnattr_t * __restrict, struct sched_param * __restrict)
-);
-int _EXFUN(posix_spawnattr_getschedpolicy,
-	(const posix_spawnattr_t * __restrict, int * __restrict)
-);
-int _EXFUN(posix_spawnattr_getsigdefault,
-	(const posix_spawnattr_t * __restrict, sigset_t * __restrict)
-);
-int _EXFUN(posix_spawnattr_getsigmask,
-	(const posix_spawnattr_t * __restrict, sigset_t * __restrict)
-);
+int posix_spawnattr_getflags (const posix_spawnattr_t * __restrict,
+			      short * __restrict);
+int posix_spawnattr_getpgroup (const posix_spawnattr_t * __restrict,
+			       pid_t * __restrict);
+int posix_spawnattr_getschedparam (const posix_spawnattr_t * __restrict,
+				   struct sched_param * __restrict);
+int posix_spawnattr_getschedpolicy (const posix_spawnattr_t * __restrict,
+				    int * __restrict);
+int posix_spawnattr_getsigdefault (const posix_spawnattr_t * __restrict,
+				   sigset_t * __restrict);
+int posix_spawnattr_getsigmask (const posix_spawnattr_t * __restrict,
+				sigset_t * __restrict);
 
-int _EXFUN(posix_spawnattr_setflags, (posix_spawnattr_t *, short));
-int _EXFUN(posix_spawnattr_setpgroup, (posix_spawnattr_t *, pid_t));
-int _EXFUN(posix_spawnattr_setschedparam,
-	(posix_spawnattr_t * __restrict, const struct sched_param * __restrict)
-);
-int _EXFUN(posix_spawnattr_setschedpolicy, (posix_spawnattr_t *, int));
-int _EXFUN(posix_spawnattr_setsigdefault,
-	(posix_spawnattr_t * __restrict, const sigset_t * __restrict)
-);
-int _EXFUN(posix_spawnattr_setsigmask,
-	(posix_spawnattr_t * __restrict, const sigset_t * __restrict)
-);
+int posix_spawnattr_setflags (posix_spawnattr_t *, short);
+int posix_spawnattr_setpgroup (posix_spawnattr_t *, pid_t);
+int posix_spawnattr_setschedparam (posix_spawnattr_t * __restrict,
+				   const struct sched_param * __restrict);
+int posix_spawnattr_setschedpolicy (posix_spawnattr_t *, int);
+int posix_spawnattr_setsigdefault (posix_spawnattr_t * __restrict,
+				   const sigset_t * __restrict);
+int posix_spawnattr_setsigmask (posix_spawnattr_t * __restrict,
+				const sigset_t * __restrict);
 _END_STD_C
 
 #endif /* !_SPAWN_H_ */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 127145083..cbc0fa989 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -178,155 +178,155 @@ typedef _fpos64_t fpos64_t;
 #endif
 
 #if __POSIX_VISIBLE
-char *	_EXFUN(ctermid, (char *));
+char *	ctermid (char *);
 #endif
 #if __XSI_VISIBLE && __XSI_VISIBLE < 600
-char *	_EXFUN(cuserid, (char *));
+char *	cuserid (char *);
 #endif
-FILE *	_EXFUN(tmpfile, (void));
-char *	_EXFUN(tmpnam, (char *));
+FILE *	tmpfile (void);
+char *	tmpnam (char *);
 #if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-char *	_EXFUN(tempnam, (const char *, const char *));
-#endif
-int	_EXFUN(fclose, (FILE *));
-int	_EXFUN(fflush, (FILE *));
-FILE *	_EXFUN(freopen, (const char *__restrict, const char *__restrict, FILE *__restrict));
-void	_EXFUN(setbuf, (FILE *__restrict, char *__restrict));
-int	_EXFUN(setvbuf, (FILE *__restrict, char *__restrict, int, size_t));
-int	_EXFUN(fprintf, (FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(fscanf, (FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(printf, (const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int	_EXFUN(scanf, (const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int	_EXFUN(sscanf, (const char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(vfprintf, (FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vprintf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int	_EXFUN(vsprintf, (char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(fgetc, (FILE *));
-char *  _EXFUN(fgets, (char *__restrict, int, FILE *__restrict));
-int	_EXFUN(fputc, (int, FILE *));
-int	_EXFUN(fputs, (const char *__restrict, FILE *__restrict));
-int	_EXFUN(getc, (FILE *));
-int	_EXFUN(getchar, (void));
-char *  _EXFUN(gets, (char *));
-int	_EXFUN(putc, (int, FILE *));
-int	_EXFUN(putchar, (int));
-int	_EXFUN(puts, (const char *));
-int	_EXFUN(ungetc, (int, FILE *));
-size_t	_EXFUN(fread, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(fwrite, (const void *__restrict , size_t _size, size_t _n, FILE *));
+char *	tempnam (const char *, const char *);
+#endif
+int	fclose (FILE *);
+int	fflush (FILE *);
+FILE *	freopen (const char *__restrict, const char *__restrict, FILE *__restrict);
+void	setbuf (FILE *__restrict, char *__restrict);
+int	setvbuf (FILE *__restrict, char *__restrict, int, size_t);
+int	fprintf (FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	fscanf (FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	printf (const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
+int	scanf (const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 2)));
+int	sscanf (const char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	vfprintf (FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vprintf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
+int	vsprintf (char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	fgetc (FILE *);
+char *  fgets (char *__restrict, int, FILE *__restrict);
+int	fputc (int, FILE *);
+int	fputs (const char *__restrict, FILE *__restrict);
+int	getc (FILE *);
+int	getchar (void);
+char *  gets (char *);
+int	putc (int, FILE *);
+int	putchar (int);
+int	puts (const char *);
+int	ungetc (int, FILE *);
+size_t	fread (void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	fwrite (const void *__restrict , size_t _size, size_t _n, FILE *);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(fgetpos, (FILE *, _fpos_t *));
+int	fgetpos (FILE *, _fpos_t *);
 #else
-int	_EXFUN(fgetpos, (FILE *__restrict, fpos_t *__restrict));
+int	fgetpos (FILE *__restrict, fpos_t *__restrict);
 #endif
-int	_EXFUN(fseek, (FILE *, long, int));
+int	fseek (FILE *, long, int);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(fsetpos, (FILE *, const _fpos_t *));
+int	fsetpos (FILE *, const _fpos_t *);
 #else
-int	_EXFUN(fsetpos, (FILE *, const fpos_t *));
-#endif
-long	_EXFUN(ftell, ( FILE *));
-void	_EXFUN(rewind, (FILE *));
-void	_EXFUN(clearerr, (FILE *));
-int	_EXFUN(feof, (FILE *));
-int	_EXFUN(ferror, (FILE *));
-void    _EXFUN(perror, (const char *));
+int	fsetpos (FILE *, const fpos_t *);
+#endif
+long	ftell ( FILE *);
+void	rewind (FILE *);
+void	clearerr (FILE *);
+int	feof (FILE *);
+int	ferror (FILE *);
+void    perror (const char *);
 #ifndef _REENT_ONLY
-FILE *	_EXFUN(fopen, (const char *__restrict _name, const char *__restrict _type));
-int	_EXFUN(sprintf, (char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(remove, (const char *));
-int	_EXFUN(rename, (const char *, const char *));
+FILE *	fopen (const char *__restrict _name, const char *__restrict _type);
+int	sprintf (char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	remove (const char *);
+int	rename (const char *, const char *);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(_rename, (const char *, const char *));
+int	_rename (const char *, const char *);
 #endif
 #endif
 #if __LARGEFILE_VISIBLE || __POSIX_VISIBLE >= 200112
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(fseeko, (FILE *, _off_t, int));
-_off_t	_EXFUN(ftello, ( FILE *));
+int	fseeko (FILE *, _off_t, int);
+_off_t	ftello (FILE *);
 #else
-int	_EXFUN(fseeko, (FILE *, off_t, int));
-off_t	_EXFUN(ftello, ( FILE *));
+int	fseeko (FILE *, off_t, int);
+off_t	ftello (FILE *);
 #endif
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(fcloseall, (void));
+int	fcloseall (void);
 #endif
 #ifndef _REENT_ONLY
 #if __ISO_C_VISIBLE >= 1999
-int	_EXFUN(snprintf, (char *__restrict, size_t, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(vsnprintf, (char *__restrict, size_t, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(vfscanf, (FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(vscanf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
-int	_EXFUN(vsscanf, (const char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
+int	snprintf (char *__restrict, size_t, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	vsnprintf (char *__restrict, size_t, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	vfscanf (FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	vscanf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 0)));
+int	vsscanf (const char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(asprintf, (char **__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(vasprintf, (char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int	asprintf (char **__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	vasprintf (char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
 #endif
 #if __MISC_VISIBLE /* Newlib-specific */
-int	_EXFUN(asiprintf, (char **, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-char *	_EXFUN(asniprintf, (char *, size_t *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-char *	_EXFUN(asnprintf, (char *__restrict, size_t *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+int	asiprintf (char **, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+char *	asniprintf (char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+char *	asnprintf (char *__restrict, size_t *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
 #ifndef diprintf
-int	_EXFUN(diprintf, (int, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-#endif
-int	_EXFUN(fiprintf, (FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(fiscanf, (FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(iprintf, (const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int	_EXFUN(iscanf, (const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int	_EXFUN(siprintf, (char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(siscanf, (const char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(sniprintf, (char *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(vasiprintf, (char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-char *	_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-char *	_EXFUN(vasnprintf, (char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(vdiprintf, (int, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(viprintf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int	_EXFUN(viscanf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
-int	_EXFUN(vsiprintf, (char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vsiscanf, (const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+int	diprintf (int, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+#endif
+int	fiprintf (FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	fiscanf (FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	iprintf (const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
+int	iscanf (const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 2)));
+int	siprintf (char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	siscanf (const char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	sniprintf (char *, size_t, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	vasiprintf (char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+char *	vasniprintf (char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+char *	vasnprintf (char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	vdiprintf (int, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vfiprintf (FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vfiscanf (FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	viprintf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
+int	viscanf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 0)));
+int	vsiprintf (char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vsiscanf (const char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	vsniprintf (char *, size_t, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
 #endif /* __MISC_VISIBLE */
 #endif /* !_REENT_ONLY */
 
@@ -336,32 +336,32 @@ int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
 
 #if __POSIX_VISIBLE
 #ifndef _REENT_ONLY
-FILE *	_EXFUN(fdopen, (int, const char *));
+FILE *	fdopen (int, const char *);
 #endif
-int	_EXFUN(fileno, (FILE *));
+int	fileno (FILE *);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE >= 199209
-int	_EXFUN(pclose, (FILE *));
-FILE *  _EXFUN(popen, (const char *, const char *));
+int	pclose (FILE *);
+FILE *  popen (const char *, const char *);
 #endif
 
 #if __BSD_VISIBLE
-void    _EXFUN(setbuffer, (FILE *, char *, int));
-int	_EXFUN(setlinebuf, (FILE *));
+void    setbuffer (FILE *, char *, int);
+int	setlinebuf (FILE *);
 #endif
 
 #if __MISC_VISIBLE || (__XSI_VISIBLE && __POSIX_VISIBLE < 200112)
-int	_EXFUN(getw, (FILE *));
-int	_EXFUN(putw, (int, FILE *));
+int	getw (FILE *);
+int	putw (int, FILE *);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE
-int	_EXFUN(getc_unlocked, (FILE *));
-int	_EXFUN(getchar_unlocked, (void));
-void	_EXFUN(flockfile, (FILE *));
-int	_EXFUN(ftrylockfile, (FILE *));
-void	_EXFUN(funlockfile, (FILE *));
-int	_EXFUN(putc_unlocked, (int, FILE *));
-int	_EXFUN(putchar_unlocked, (int));
+int	getc_unlocked (FILE *);
+int	getchar_unlocked (void);
+void	flockfile (FILE *);
+int	ftrylockfile (FILE *);
+void	funlockfile (FILE *);
+int	putc_unlocked (int, FILE *);
+int	putchar_unlocked (int);
 #endif
 
 /*
@@ -371,21 +371,21 @@ int	_EXFUN(putchar_unlocked, (int));
 #if __POSIX_VISIBLE >= 200809
 # ifndef _REENT_ONLY
 #  ifndef dprintf
-int	_EXFUN(dprintf, (int, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	dprintf (int, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
 #  endif
-FILE *	_EXFUN(fmemopen, (void *__restrict, size_t, const char *__restrict));
+FILE *	fmemopen (void *__restrict, size_t, const char *__restrict);
 /* getdelim - see __getdelim for now */
 /* getline - see __getline for now */
-FILE *	_EXFUN(open_memstream, (char **, size_t *));
-int	_EXFUN(vdprintf, (int, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+FILE *	open_memstream (char **, size_t *);
+int	vdprintf (int, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
 # endif
 #endif
 #if __ATFILE_VISIBLE
-int	_EXFUN(renameat, (int, const char *, int, const char *));
+int	renameat (int, const char *, int, const char *);
 # ifdef __CYGWIN__
-int	_EXFUN(renameat2, (int, const char *, int, const char *, unsigned int));
+int	renameat2 (int, const char *, int, const char *, unsigned int);
 # endif
 #endif
 
@@ -393,180 +393,180 @@ int	_EXFUN(renameat2, (int, const char *, int, const char *, unsigned int));
  * Recursive versions of the above.
  */
 
-int	_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-char *	_EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-char *	_EXFUN(_asnprintf_r, (struct _reent *, char *__restrict, size_t *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_asprintf_r, (struct _reent *, char **__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_dprintf_r, (struct _reent *, int, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_fclose_r, (struct _reent *, FILE *));
-int	_EXFUN(_fcloseall_r, (struct _reent *));
-FILE *	_EXFUN(_fdopen_r, (struct _reent *, int, const char *));
-int	_EXFUN(_fflush_r, (struct _reent *, FILE *));
-int	_EXFUN(_fgetc_r, (struct _reent *, FILE *));
-int	_EXFUN(_fgetc_unlocked_r, (struct _reent *, FILE *));
-char *  _EXFUN(_fgets_r, (struct _reent *, char *__restrict, int, FILE *__restrict));
-char *  _EXFUN(_fgets_unlocked_r, (struct _reent *, char *__restrict, int, FILE *__restrict));
+int	_asiprintf_r (struct _reent *, char **, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+char *	_asniprintf_r (struct _reent *, char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+char *	_asnprintf_r (struct _reent *, char *__restrict, size_t *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int	_asprintf_r (struct _reent *, char **__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_diprintf_r (struct _reent *, int, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_dprintf_r (struct _reent *, int, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_fclose_r (struct _reent *, FILE *);
+int	_fcloseall_r (struct _reent *);
+FILE *	_fdopen_r (struct _reent *, int, const char *);
+int	_fflush_r (struct _reent *, FILE *);
+int	_fgetc_r (struct _reent *, FILE *);
+int	_fgetc_unlocked_r (struct _reent *, FILE *);
+char *  _fgets_r (struct _reent *, char *__restrict, int, FILE *__restrict);
+char *  _fgets_unlocked_r (struct _reent *, char *__restrict, int, FILE *__restrict);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(_fgetpos_r, (struct _reent *, FILE *__restrict, _fpos_t *__restrict));
-int	_EXFUN(_fsetpos_r, (struct _reent *, FILE *, const _fpos_t *));
+int	_fgetpos_r (struct _reent *, FILE *__restrict, _fpos_t *__restrict);
+int	_fsetpos_r (struct _reent *, FILE *, const _fpos_t *);
 #else
-int	_EXFUN(_fgetpos_r, (struct _reent *, FILE *, fpos_t *));
-int	_EXFUN(_fsetpos_r, (struct _reent *, FILE *, const fpos_t *));
-#endif
-int	_EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-FILE *	_EXFUN(_fmemopen_r, (struct _reent *, void *__restrict, size_t, const char *__restrict));
-FILE *	_EXFUN(_fopen_r, (struct _reent *, const char *__restrict, const char *__restrict));
-FILE *	_EXFUN(_freopen_r, (struct _reent *, const char *__restrict, const char *__restrict, FILE *__restrict));
-int	_EXFUN(_fprintf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_fpurge_r, (struct _reent *, FILE *));
-int	_EXFUN(_fputc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_fputc_unlocked_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_fputs_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-int	_EXFUN(_fputs_unlocked_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-size_t	_EXFUN(_fread_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(_fread_unlocked_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-int	_EXFUN(_fscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-int	_EXFUN(_fseek_r, (struct _reent *, FILE *, long, int));
-int	_EXFUN(_fseeko_r,(struct _reent *, FILE *, _off_t, int));
-long	_EXFUN(_ftell_r, (struct _reent *, FILE *));
-_off_t	_EXFUN(_ftello_r,(struct _reent *, FILE *));
-void	_EXFUN(_rewind_r, (struct _reent *, FILE *));
-size_t	_EXFUN(_fwrite_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(_fwrite_unlocked_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-int	_EXFUN(_getc_r, (struct _reent *, FILE *));
-int	_EXFUN(_getc_unlocked_r, (struct _reent *, FILE *));
-int	_EXFUN(_getchar_r, (struct _reent *));
-int	_EXFUN(_getchar_unlocked_r, (struct _reent *));
-char *	_EXFUN(_gets_r, (struct _reent *, char *));
-int	_EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(_iscanf_r, (struct _reent *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-FILE *	_EXFUN(_open_memstream_r, (struct _reent *, char **, size_t *));
-void	_EXFUN(_perror_r, (struct _reent *, const char *));
-int	_EXFUN(_printf_r, (struct _reent *, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(_putc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_putc_unlocked_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_putchar_unlocked_r, (struct _reent *, int));
-int	_EXFUN(_putchar_r, (struct _reent *, int));
-int	_EXFUN(_puts_r, (struct _reent *, const char *));
-int	_EXFUN(_remove_r, (struct _reent *, const char *));
-int	_EXFUN(_rename_r, (struct _reent *,
-			   const char *_old, const char *_new));
-int	_EXFUN(_scanf_r, (struct _reent *, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-int	_EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_snprintf_r, (struct _reent *, char *__restrict, size_t, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_sprintf_r, (struct _reent *, char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_sscanf_r, (struct _reent *, const char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-char *	_EXFUN(_tempnam_r, (struct _reent *, const char *, const char *));
-FILE *	_EXFUN(_tmpfile_r, (struct _reent *));
-char *	_EXFUN(_tmpnam_r, (struct _reent *, char *));
-int	_EXFUN(_ungetc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-char *	_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-char *	_EXFUN(_vasnprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vasprintf_r, (struct _reent *, char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vdprintf_r, (struct _reent *, int, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_vfprintf_r, (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(_vprintf_r, (struct _reent *, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(_vscanf_r, (struct _reent *, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vsnprintf_r, (struct _reent *, char *__restrict, size_t, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vsprintf_r, (struct _reent *, char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vsscanf_r, (struct _reent *, const char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
+int	_fgetpos_r (struct _reent *, FILE *, fpos_t *);
+int	_fsetpos_r (struct _reent *, FILE *, const fpos_t *);
+#endif
+int	_fiprintf_r (struct _reent *, FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_fiscanf_r (struct _reent *, FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+FILE *	_fmemopen_r (struct _reent *, void *__restrict, size_t, const char *__restrict);
+FILE *	_fopen_r (struct _reent *, const char *__restrict, const char *__restrict);
+FILE *	_freopen_r (struct _reent *, const char *__restrict, const char *__restrict, FILE *__restrict);
+int	_fprintf_r (struct _reent *, FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_fpurge_r (struct _reent *, FILE *);
+int	_fputc_r (struct _reent *, int, FILE *);
+int	_fputc_unlocked_r (struct _reent *, int, FILE *);
+int	_fputs_r (struct _reent *, const char *__restrict, FILE *__restrict);
+int	_fputs_unlocked_r (struct _reent *, const char *__restrict, FILE *__restrict);
+size_t	_fread_r (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	_fread_unlocked_r (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+int	_fscanf_r (struct _reent *, FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+int	_fseek_r (struct _reent *, FILE *, long, int);
+int	_fseeko_r (struct _reent *, FILE *, _off_t, int);
+long	_ftell_r (struct _reent *, FILE *);
+_off_t	_ftello_r (struct _reent *, FILE *);
+void	_rewind_r (struct _reent *, FILE *);
+size_t	_fwrite_r (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	_fwrite_unlocked_r (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+int	_getc_r (struct _reent *, FILE *);
+int	_getc_unlocked_r (struct _reent *, FILE *);
+int	_getchar_r (struct _reent *);
+int	_getchar_unlocked_r (struct _reent *);
+char *	_gets_r (struct _reent *, char *);
+int	_iprintf_r (struct _reent *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	_iscanf_r (struct _reent *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+FILE *	_open_memstream_r (struct _reent *, char **, size_t *);
+void	_perror_r (struct _reent *, const char *);
+int	_printf_r (struct _reent *, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	_putc_r (struct _reent *, int, FILE *);
+int	_putc_unlocked_r (struct _reent *, int, FILE *);
+int	_putchar_unlocked_r (struct _reent *, int);
+int	_putchar_r (struct _reent *, int);
+int	_puts_r (struct _reent *, const char *);
+int	_remove_r (struct _reent *, const char *);
+int	_rename_r (struct _reent *,
+			   const char *_old, const char *_new);
+int	_scanf_r (struct _reent *, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	_siprintf_r (struct _reent *, char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_siscanf_r (struct _reent *, const char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+int	_sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int	_snprintf_r (struct _reent *, char *__restrict, size_t, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int	_sprintf_r (struct _reent *, char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_sscanf_r (struct _reent *, const char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+char *	_tempnam_r (struct _reent *, const char *, const char *);
+FILE *	_tmpfile_r (struct _reent *);
+char *	_tmpnam_r (struct _reent *, char *);
+int	_ungetc_r (struct _reent *, int, FILE *);
+int	_vasiprintf_r (struct _reent *, char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+char *	_vasniprintf_r (struct _reent*, char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+char *	_vasnprintf_r (struct _reent*, char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int	_vasprintf_r (struct _reent *, char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vdiprintf_r (struct _reent *, int, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vdprintf_r (struct _reent *, int, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int	_vfprintf_r (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vfscanf_r (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int	_viprintf_r (struct _reent *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	_viscanf_r (struct _reent *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	_vprintf_r (struct _reent *, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	_vscanf_r (struct _reent *, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	_vsiprintf_r (struct _reent *, char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vsiscanf_r (struct _reent *, const char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int	_vsniprintf_r (struct _reent *, char *, size_t, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int	_vsnprintf_r (struct _reent *, char *__restrict, size_t, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int	_vsprintf_r (struct _reent *, char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vsscanf_r (struct _reent *, const char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
 
 /* Other extensions.  */
 
-int	_EXFUN(fpurge, (FILE *));
-ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
-ssize_t _EXFUN(__getline, (char **, size_t *, FILE *));
+int	fpurge (FILE *);
+ssize_t __getdelim (char **, size_t *, int, FILE *);
+ssize_t __getline (char **, size_t *, FILE *);
 
 #if __MISC_VISIBLE
-void	_EXFUN(clearerr_unlocked, (FILE *));
-int	_EXFUN(feof_unlocked, (FILE *));
-int	_EXFUN(ferror_unlocked, (FILE *));
-int	_EXFUN(fileno_unlocked, (FILE *));
-int	_EXFUN(fflush_unlocked, (FILE *));
-int	_EXFUN(fgetc_unlocked, (FILE *));
-int	_EXFUN(fputc_unlocked, (int, FILE *));
-size_t	_EXFUN(fread_unlocked, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(fwrite_unlocked, (const void *__restrict , size_t _size, size_t _n, FILE *));
+void	clearerr_unlocked (FILE *);
+int	feof_unlocked (FILE *);
+int	ferror_unlocked (FILE *);
+int	fileno_unlocked (FILE *);
+int	fflush_unlocked (FILE *);
+int	fgetc_unlocked (FILE *);
+int	fputc_unlocked (int, FILE *);
+size_t	fread_unlocked (void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	fwrite_unlocked (const void *__restrict , size_t _size, size_t _n, FILE *);
 #endif
 
 #if __GNU_VISIBLE
-char *  _EXFUN(fgets_unlocked, (char *__restrict, int, FILE *__restrict));
-int	_EXFUN(fputs_unlocked, (const char *__restrict, FILE *__restrict));
+char *  fgets_unlocked (char *__restrict, int, FILE *__restrict);
+int	fputs_unlocked (const char *__restrict, FILE *__restrict);
 #endif
 
 #ifdef __LARGE64_FILES
 #if !defined(__CYGWIN__) || defined(_COMPILING_NEWLIB)
-FILE *	_EXFUN(fdopen64, (int, const char *));
-FILE *  _EXFUN(fopen64, (const char *, const char *));
-FILE *  _EXFUN(freopen64, (const char *, const char *, FILE *));
-_off64_t _EXFUN(ftello64, (FILE *));
-_off64_t _EXFUN(fseeko64, (FILE *, _off64_t, int));
-int     _EXFUN(fgetpos64, (FILE *, _fpos64_t *));
-int     _EXFUN(fsetpos64, (FILE *, const _fpos64_t *));
-FILE *  _EXFUN(tmpfile64, (void));
-
-FILE *	_EXFUN(_fdopen64_r, (struct _reent *, int, const char *));
-FILE *  _EXFUN(_fopen64_r, (struct _reent *,const char *, const char *));
-FILE *  _EXFUN(_freopen64_r, (struct _reent *, const char *, const char *, FILE *));
-_off64_t _EXFUN(_ftello64_r, (struct _reent *, FILE *));
-_off64_t _EXFUN(_fseeko64_r, (struct _reent *, FILE *, _off64_t, int));
-int     _EXFUN(_fgetpos64_r, (struct _reent *, FILE *, _fpos64_t *));
-int     _EXFUN(_fsetpos64_r, (struct _reent *, FILE *, const _fpos64_t *));
-FILE *  _EXFUN(_tmpfile64_r, (struct _reent *));
+FILE *	fdopen64 (int, const char *);
+FILE *  fopen64 (const char *, const char *);
+FILE *  freopen64 (const char *, const char *, FILE *);
+_off64_t ftello64 (FILE *);
+_off64_t fseeko64 (FILE *, _off64_t, int);
+int     fgetpos64 (FILE *, _fpos64_t *);
+int     fsetpos64 (FILE *, const _fpos64_t *);
+FILE *  tmpfile64 (void);
+
+FILE *	_fdopen64_r (struct _reent *, int, const char *);
+FILE *  _fopen64_r (struct _reent *,const char *, const char *);
+FILE *  _freopen64_r (struct _reent *, const char *, const char *, FILE *);
+_off64_t _ftello64_r (struct _reent *, FILE *);
+_off64_t _fseeko64_r (struct _reent *, FILE *, _off64_t, int);
+int     _fgetpos64_r (struct _reent *, FILE *, _fpos64_t *);
+int     _fsetpos64_r (struct _reent *, FILE *, const _fpos64_t *);
+FILE *  _tmpfile64_r (struct _reent *);
 #endif /* !__CYGWIN__ */
 #endif /* __LARGE64_FILES */
 
@@ -574,8 +574,8 @@ FILE *  _EXFUN(_tmpfile64_r, (struct _reent *));
  * Routines internal to the implementation.
  */
 
-int	_EXFUN(__srget_r, (struct _reent *, FILE *));
-int	_EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
+int	__srget_r (struct _reent *, FILE *);
+int	__swbuf_r (struct _reent *, int, FILE *);
 
 /*
  * Stdio function-access interface.
@@ -583,35 +583,35 @@ int	_EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
 
 #if __BSD_VISIBLE
 # ifdef __LARGE64_FILES
-FILE	*_EXFUN(funopen,(const void *__cookie,
+FILE	*funopen (const void *__cookie,
 		int (*__readfn)(void *__c, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__c, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		_fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
-		int (*__closefn)(void *__c)));
-FILE	*_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+		int (*__closefn)(void *__c));
+FILE	*_funopen_r (struct _reent *, const void *__cookie,
 		int (*__readfn)(void *__c, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__c, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		_fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
-		int (*__closefn)(void *__c)));
+		int (*__closefn)(void *__c));
 # else
-FILE	*_EXFUN(funopen,(const void *__cookie,
+FILE	*funopen (const void *__cookie,
 		int (*__readfn)(void *__cookie, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__cookie, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
-		int (*__closefn)(void *__cookie)));
-FILE	*_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+		int (*__closefn)(void *__cookie));
+FILE	*_funopen_r (struct _reent *, const void *__cookie,
 		int (*__readfn)(void *__cookie, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__cookie, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
-		int (*__closefn)(void *__cookie)));
+		int (*__closefn)(void *__cookie));
 # endif /* !__LARGE64_FILES */
 
 # define	fropen(__cookie, __fn) funopen(__cookie, __fn, (int (*)())0, \
@@ -640,10 +640,10 @@ typedef struct
   cookie_seek_function_t  *seek;
   cookie_close_function_t *close;
 } cookie_io_functions_t;
-FILE *_EXFUN(fopencookie,(void *__cookie,
-		const char *__mode, cookie_io_functions_t __functions));
-FILE *_EXFUN(_fopencookie_r,(struct _reent *, void *__cookie,
-		const char *__mode, cookie_io_functions_t __functions));
+FILE *fopencookie (void *__cookie,
+		const char *__mode, cookie_io_functions_t __functions);
+FILE *_fopencookie_r (struct _reent *, void *__cookie,
+		const char *__mode, cookie_io_functions_t __functions);
 #endif /* __GNU_VISIBLE */
 
 #ifndef __CUSTOM_FILE_IO__
diff --git a/newlib/libc/include/stdio_ext.h b/newlib/libc/include/stdio_ext.h
index 029ab0253..231262d47 100644
--- a/newlib/libc/include/stdio_ext.h
+++ b/newlib/libc/include/stdio_ext.h
@@ -19,8 +19,8 @@
 
 _BEGIN_STD_C
 
-void	 _EXFUN(__fpurge,(FILE *));
-int	 _EXFUN(__fsetlocking,(FILE *, int));
+void	 __fpurge (FILE *);
+int	 __fsetlocking (FILE *, int);
 
 /* TODO:
 
@@ -52,13 +52,13 @@ __fpending (FILE *__fp) { return __fp->_p - __fp->_bf._base; }
 
 #else
 
-size_t	 _EXFUN(__fbufsize,(FILE *));
-int	 _EXFUN(__freading,(FILE *));
-int	 _EXFUN(__fwriting,(FILE *));
-int	 _EXFUN(__freadable,(FILE *));
-int	 _EXFUN(__fwritable,(FILE *));
-int	 _EXFUN(__flbf,(FILE *));
-size_t	 _EXFUN(__fpending,(FILE *));
+size_t	 __fbufsize (FILE *);
+int	 __freading (FILE *);
+int	 __fwriting (FILE *);
+int	 __freadable (FILE *);
+int	 __fwritable (FILE *);
+int	 __flbf (FILE *);
+size_t	 __fpending (FILE *);
 
 #ifndef __cplusplus
 
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 80f15f4e9..ef0e4bdda 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -62,102 +62,102 @@ typedef int (*__compar_fn_t) (const void *, const void *);
 
 #define RAND_MAX __RAND_MAX
 
-int	_EXFUN(__locale_mb_cur_max,(void));
+int	__locale_mb_cur_max (void);
 
 #define MB_CUR_MAX __locale_mb_cur_max()
 
-void	_EXFUN(abort,(void) _ATTRIBUTE ((__noreturn__)));
-int	_EXFUN(abs,(int));
+void	abort (void) _ATTRIBUTE ((__noreturn__));
+int	abs (int);
 #if __BSD_VISIBLE
-__uint32_t _EXFUN(arc4random, (void));
-__uint32_t _EXFUN(arc4random_uniform, (__uint32_t));
-void    _EXFUN(arc4random_buf, (void *, size_t));
+__uint32_t arc4random (void);
+__uint32_t arc4random_uniform (__uint32_t);
+void    arc4random_buf (void *, size_t);
 #endif
-int	_EXFUN(atexit,(void (*__func)(void)));
-double	_EXFUN(atof,(const char *__nptr));
+int	atexit (void (*__func)(void));
+double	atof (const char *__nptr);
 #if __MISC_VISIBLE
-float	_EXFUN(atoff,(const char *__nptr));
+float	atoff (const char *__nptr);
 #endif
-int	_EXFUN(atoi,(const char *__nptr));
-int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
-long	_EXFUN(atol,(const char *__nptr));
-long	_EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-void *	_EXFUN(bsearch,(const void *__key,
+int	atoi (const char *__nptr);
+int	_atoi_r (struct _reent *, const char *__nptr);
+long	atol (const char *__nptr);
+long	_atol_r (struct _reent *, const char *__nptr);
+void *	bsearch (const void *__key,
 		       const void *__base,
 		       size_t __nmemb,
 		       size_t __size,
-		       __compar_fn_t _compar));
-void *	_EXFUN_NOTHROW(calloc,(size_t __nmemb, size_t __size));
-div_t	_EXFUN(div,(int __numer, int __denom));
-void	_EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
-void	_EXFUN_NOTHROW(free,(void *));
-char *  _EXFUN(getenv,(const char *__string));
-char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
-char *	_EXFUN(_findenv,(const char *, int *));
-char *	_EXFUN(_findenv_r,(struct _reent *, const char *, int *));
+		       __compar_fn_t _compar);
+void *	calloc (size_t __nmemb, size_t __size) _NOTHROW;
+div_t	div (int __numer, int __denom);
+void	exit (int __status) _ATTRIBUTE ((__noreturn__));
+void	free (void *) _NOTHROW;
+char *  getenv (const char *__string);
+char *	_getenv_r (struct _reent *, const char *__string);
+char *	_findenv (const char *, int *);
+char *	_findenv_r (struct _reent *, const char *, int *);
 #if __POSIX_VISIBLE >= 200809
 extern char *suboptarg;			/* getsubopt(3) external variable */
-int	_EXFUN(getsubopt,(char **, char * const *, char **));
-#endif
-long	_EXFUN(labs,(long));
-ldiv_t	_EXFUN(ldiv,(long __numer, long __denom));
-void *	_EXFUN_NOTHROW(malloc,(size_t __size));
-int	_EXFUN(mblen,(const char *, size_t));
-int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
-int	_EXFUN(mbtowc,(wchar_t *__restrict, const char *__restrict, size_t));
-int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *));
-int	_EXFUN(wctomb,(char *, wchar_t));
-int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
-size_t	_EXFUN(mbstowcs,(wchar_t *__restrict, const char *__restrict, size_t));
-size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *));
-size_t	_EXFUN(wcstombs,(char *__restrict, const wchar_t *__restrict, size_t));
-size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *__restrict, const wchar_t *__restrict, size_t, _mbstate_t *));
+int	getsubopt (char **, char * const *, char **);
+#endif
+long	labs (long);
+ldiv_t	ldiv (long __numer, long __denom);
+void *	malloc (size_t __size) _NOTHROW;
+int	mblen (const char *, size_t);
+int	_mblen_r (struct _reent *, const char *, size_t, _mbstate_t *);
+int	mbtowc (wchar_t *__restrict, const char *__restrict, size_t);
+int	_mbtowc_r (struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *);
+int	wctomb (char *, wchar_t);
+int	_wctomb_r (struct _reent *, char *, wchar_t, _mbstate_t *);
+size_t	mbstowcs (wchar_t *__restrict, const char *__restrict, size_t);
+size_t	_mbstowcs_r (struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *);
+size_t	wcstombs (char *__restrict, const wchar_t *__restrict, size_t);
+size_t	_wcstombs_r (struct _reent *, char *__restrict, const wchar_t *__restrict, size_t, _mbstate_t *);
 #ifndef _REENT_ONLY
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
-char *	_EXFUN(mkdtemp,(char *));
+char *	mkdtemp (char *);
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(mkostemp,(char *, int));
-int	_EXFUN(mkostemps,(char *, int, int));
+int	mkostemp (char *, int);
+int	mkostemps (char *, int, int);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4
-int	_EXFUN(mkstemp,(char *));
+int	mkstemp (char *);
 #endif
 #if __MISC_VISIBLE
-int	_EXFUN(mkstemps,(char *, int));
+int	mkstemps (char *, int);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-char *	_EXFUN(mktemp,(char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
+char *	mktemp (char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead")));
 #endif
 #endif /* !_REENT_ONLY */
-char *	_EXFUN(_mkdtemp_r, (struct _reent *, char *));
-int	_EXFUN(_mkostemp_r, (struct _reent *, char *, int));
-int	_EXFUN(_mkostemps_r, (struct _reent *, char *, int, int));
-int	_EXFUN(_mkstemp_r, (struct _reent *, char *));
-int	_EXFUN(_mkstemps_r, (struct _reent *, char *, int));
-char *	_EXFUN(_mktemp_r, (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
-void	_EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
-int	_EXFUN(rand,(void));
-void *	_EXFUN_NOTHROW(realloc,(void *__r, size_t __size));
+char *	_mkdtemp_r (struct _reent *, char *);
+int	_mkostemp_r (struct _reent *, char *, int);
+int	_mkostemps_r (struct _reent *, char *, int, int);
+int	_mkstemp_r (struct _reent *, char *);
+int	_mkstemps_r (struct _reent *, char *, int);
+char *	_mktemp_r (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead")));
+void	qsort (void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar);
+int	rand (void);
+void *	realloc (void *__r, size_t __size) _NOTHROW;
 #if __BSD_VISIBLE
 void	*reallocarray(void *, size_t, size_t) __result_use_check __alloc_size(2)
 	    __alloc_size(3);
-void *	_EXFUN(reallocf,(void *__r, size_t __size));
+void *	reallocf (void *__r, size_t __size);
 #endif
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4
-char *	_EXFUN(realpath, (const char *__restrict path, char *__restrict resolved_path));
+char *	realpath (const char *__restrict path, char *__restrict resolved_path);
 #endif
 #if __BSD_VISIBLE
-int	_EXFUN(rpmatch, (const char *response));
+int	rpmatch (const char *response);
 #endif
 #if __XSI_VISIBLE
-void	_EXFUN(setkey, (const char *__key));
+void	setkey (const char *__key);
 #endif
-void	_EXFUN(srand,(unsigned __seed));
-double	_EXFUN(strtod,(const char *__restrict __n, char **__restrict __end_PTR));
-double	_EXFUN(_strtod_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR));
+void	srand (unsigned __seed);
+double	strtod (const char *__restrict __n, char **__restrict __end_PTR);
+double	_strtod_r (struct _reent *,const char *__restrict __n, char **__restrict __end_PTR);
 #if __ISO_C_VISIBLE >= 1999
-float	_EXFUN(strtof,(const char *__restrict __n, char **__restrict __end_PTR));
+float	strtof (const char *__restrict __n, char **__restrict __end_PTR);
 #endif
 #if __MISC_VISIBLE
 /* the following strtodf interface is deprecated...use strtof instead */
@@ -165,10 +165,10 @@ float	_EXFUN(strtof,(const char *__restrict __n, char **__restrict __end_PTR));
 #  define strtodf strtof
 # endif
 #endif
-long	_EXFUN(strtol,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
-long	_EXFUN(_strtol_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base));
-unsigned long _EXFUN(strtoul,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
-unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base));
+long	strtol (const char *__restrict __n, char **__restrict __end_PTR, int __base);
+long	_strtol_r (struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base);
+unsigned long strtoul (const char *__restrict __n, char **__restrict __end_PTR, int __base);
+unsigned long _strtoul_r (struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base);
 
 #if __GNU_VISIBLE
 double	strtod_l (const char *__restrict, char **__restrict, locale_t);
@@ -185,130 +185,130 @@ unsigned long long strtoull_l (const char *__restrict, char **__restrict, int,
 			       locale_t __loc);
 #endif
 
-int	_EXFUN(system,(const char *__string));
+int	system (const char *__string);
 
 #if __SVID_VISIBLE || __XSI_VISIBLE >= 4
-long    _EXFUN(a64l,(const char *__input));
-char *  _EXFUN(l64a,(long __input));
-char *  _EXFUN(_l64a_r,(struct _reent *,long __input));
+long    a64l (const char *__input);
+char *  l64a (long __input);
+char *  _l64a_r (struct _reent *,long __input);
 #endif
 #if __MISC_VISIBLE
-int	_EXFUN(on_exit,(void (*__func)(int, void *),void *__arg));
+int	on_exit (void (*__func)(int, void *),void *__arg);
 #endif
 #if __ISO_C_VISIBLE >= 1999
-void	_EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
+void	_Exit (int __status) _ATTRIBUTE ((__noreturn__));
 #endif
 #if __SVID_VISIBLE || __XSI_VISIBLE
-int	_EXFUN(putenv,(char *__string));
+int	putenv (char *__string);
 #endif
-int	_EXFUN(_putenv_r,(struct _reent *, char *__string));
-void *	_EXFUN(_reallocf_r,(struct _reent *, void *, size_t));
+int	_putenv_r (struct _reent *, char *__string);
+void *	_reallocf_r (struct _reent *, void *, size_t);
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
-int	_EXFUN(setenv,(const char *__string, const char *__value, int __overwrite));
+int	setenv (const char *__string, const char *__value, int __overwrite);
 #endif
-int	_EXFUN(_setenv_r,(struct _reent *, const char *__string, const char *__value, int __overwrite));
+int	_setenv_r (struct _reent *, const char *__string, const char *__value, int __overwrite);
 
 #if __XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112
-char *	_EXFUN(gcvt,(double,int,char *));
-char *	_EXFUN(gcvtf,(float,int,char *));
-char *	_EXFUN(fcvt,(double,int,int *,int *));
-char *	_EXFUN(fcvtf,(float,int,int *,int *));
-char *	_EXFUN(ecvt,(double,int,int *,int *));
-char *	_EXFUN(ecvtbuf,(double, int, int*, int*, char *));
-char *	_EXFUN(fcvtbuf,(double, int, int*, int*, char *));
-char *	_EXFUN(ecvtf,(float,int,int *,int *));
-#endif
-char *	_EXFUN(__itoa,(int, char *, int));
-char *	_EXFUN(__utoa,(unsigned, char *, int));
+char *	gcvt (double,int,char *);
+char *	gcvtf (float,int,char *);
+char *	fcvt (double,int,int *,int *);
+char *	fcvtf (float,int,int *,int *);
+char *	ecvt (double,int,int *,int *);
+char *	ecvtbuf (double, int, int*, int*, char *);
+char *	fcvtbuf (double, int, int*, int*, char *);
+char *	ecvtf (float,int,int *,int *);
+#endif
+char *	__itoa (int, char *, int);
+char *	__utoa (unsigned, char *, int);
 #if __MISC_VISIBLE
-char *	_EXFUN(itoa,(int, char *, int));
-char *	_EXFUN(utoa,(unsigned, char *, int));
+char *	itoa (int, char *, int);
+char *	utoa (unsigned, char *, int);
 #endif
 #if __POSIX_VISIBLE
-int	_EXFUN(rand_r,(unsigned *__seed));
+int	rand_r (unsigned *__seed);
 #endif
 
 #if __SVID_VISIBLE || __XSI_VISIBLE
-double _EXFUN(drand48,(void));
-double _EXFUN(_drand48_r,(struct _reent *));
-double _EXFUN(erand48,(unsigned short [3]));
-double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
-long   _EXFUN(jrand48,(unsigned short [3]));
-long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-void  _EXFUN(lcong48,(unsigned short [7]));
-void  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-long   _EXFUN(lrand48,(void));
-long   _EXFUN(_lrand48_r,(struct _reent *));
-long   _EXFUN(mrand48,(void));
-long   _EXFUN(_mrand48_r,(struct _reent *));
-long   _EXFUN(nrand48,(unsigned short [3]));
-long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
+double drand48 (void);
+double _drand48_r (struct _reent *);
+double erand48 (unsigned short [3]);
+double _erand48_r (struct _reent *, unsigned short [3]);
+long   jrand48 (unsigned short [3]);
+long   _jrand48_r (struct _reent *, unsigned short [3]);
+void  lcong48 (unsigned short [7]);
+void  _lcong48_r (struct _reent *, unsigned short [7]);
+long   lrand48 (void);
+long   _lrand48_r (struct _reent *);
+long   mrand48 (void);
+long   _mrand48_r (struct _reent *);
+long   nrand48 (unsigned short [3]);
+long   _nrand48_r (struct _reent *, unsigned short [3]);
 unsigned short *
-       _EXFUN(seed48,(unsigned short [3]));
+       seed48 (unsigned short [3]);
 unsigned short *
-       _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
-void  _EXFUN(srand48,(long));
-void  _EXFUN(_srand48_r,(struct _reent *, long));
+       _seed48_r (struct _reent *, unsigned short [3]);
+void  srand48 (long);
+void  _srand48_r (struct _reent *, long);
 #endif /* __SVID_VISIBLE || __XSI_VISIBLE */
 #if __SVID_VISIBLE || __XSI_VISIBLE >= 4 || __BSD_VISIBLE
-char *	_EXFUN(initstate,(unsigned, char *, size_t));
-long	_EXFUN(random,(void));
-char *	_EXFUN(setstate,(char *));
-void	_EXFUN(srandom,(unsigned));
+char *	initstate (unsigned, char *, size_t);
+long	random (void);
+char *	setstate (char *);
+void	srandom (unsigned);
 #endif
 #if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(atoll,(const char *__nptr));
+long long atoll (const char *__nptr);
 #endif
-long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr));
+long long _atoll_r (struct _reent *, const char *__nptr);
 #if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(llabs,(long long));
-lldiv_t	_EXFUN(lldiv,(long long __numer, long long __denom));
-long long _EXFUN(strtoll,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
+long long llabs (long long);
+lldiv_t	lldiv (long long __numer, long long __denom);
+long long strtoll (const char *__restrict __n, char **__restrict __end_PTR, int __base);
 #endif
-long long _EXFUN(_strtoll_r,(struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base));
+long long _strtoll_r (struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base);
 #if __ISO_C_VISIBLE >= 1999
-unsigned long long _EXFUN(strtoull,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
+unsigned long long strtoull (const char *__restrict __n, char **__restrict __end_PTR, int __base);
 #endif
-unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base));
+unsigned long long _strtoull_r (struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base);
 
 #ifndef __CYGWIN__
 #if __MISC_VISIBLE
-void	_EXFUN(cfree,(void *));
+void	cfree (void *);
 #endif
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
-int	_EXFUN(unsetenv,(const char *__string));
+int	unsetenv (const char *__string);
 #endif
-int	_EXFUN(_unsetenv_r,(struct _reent *, const char *__string));
+int	_unsetenv_r (struct _reent *, const char *__string);
 #endif /* !__CYGWIN__ */
 
 #if __POSIX_VISIBLE >= 200112
-int _EXFUN(__nonnull ((1)) posix_memalign,(void **, size_t, size_t));
+int __nonnull ((1)) posix_memalign (void **, size_t, size_t);
 #endif
 
-char *	_EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
+char *	_dtoa_r (struct _reent *, double, int, int, int *, int*, char**);
 #ifndef __CYGWIN__
-void *	_EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
-void *	_EXFUN_NOTHROW(_calloc_r,(struct _reent *, size_t, size_t));
-void	_EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
-void *	_EXFUN_NOTHROW(_realloc_r,(struct _reent *, void *, size_t));
-void	_EXFUN(_mstats_r,(struct _reent *, char *));
+void *	_malloc_r (struct _reent *, size_t) _NOTHROW;
+void *	_calloc_r (struct _reent *, size_t, size_t) _NOTHROW;
+void	_free_r (struct _reent *, void *) _NOTHROW;
+void *	_realloc_r (struct _reent *, void *, size_t) _NOTHROW;
+void	_mstats_r (struct _reent *, char *);
 #endif
-int	_EXFUN(_system_r,(struct _reent *, const char *));
+int	_system_r (struct _reent *, const char *);
 
-void	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
+void	__eprintf (const char *, const char *, unsigned int, const char *);
 
 /* There are two common qsort_r variants.  If you request
    _BSD_SOURCE, you get the BSD version; otherwise you get the GNU
    version.  We want that #undef qsort_r will still let you
    invoke the underlying function, but that requires gcc support. */
 #if __GNU_VISIBLE
-void	_EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
+void	qsort_r (void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk);
 #elif __BSD_VISIBLE
 # ifdef __GNUC__
-void	_EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
+void	qsort_r (void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *))
              __asm__ (__ASMNAME ("__bsd_qsort_r"));
 # else
-void	_EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
+void	__bsd_qsort_r (void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *));
 #  define qsort_r __bsd_qsort_r
 # endif
 #endif
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index e44ac3079..37febadc0 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -26,30 +26,30 @@
 
 _BEGIN_STD_C
 
-void *	 _EXFUN(memchr,(const void *, int, size_t));
-int 	 _EXFUN(memcmp,(const void *, const void *, size_t));
-void *	 _EXFUN(memcpy,(void *__restrict, const void *__restrict, size_t));
-void *	 _EXFUN(memmove,(void *, const void *, size_t));
-void *	 _EXFUN(memset,(void *, int, size_t));
-char 	*_EXFUN(strcat,(char *__restrict, const char *__restrict));
-char 	*_EXFUN(strchr,(const char *, int));
-int	 _EXFUN(strcmp,(const char *, const char *));
-int	 _EXFUN(strcoll,(const char *, const char *));
-char 	*_EXFUN(strcpy,(char *__restrict, const char *__restrict));
-size_t	 _EXFUN(strcspn,(const char *, const char *));
-char 	*_EXFUN(strerror,(int));
-size_t	 _EXFUN(strlen,(const char *));
-char 	*_EXFUN(strncat,(char *__restrict, const char *__restrict, size_t));
-int	 _EXFUN(strncmp,(const char *, const char *, size_t));
-char 	*_EXFUN(strncpy,(char *__restrict, const char *__restrict, size_t));
-char 	*_EXFUN(strpbrk,(const char *, const char *));
-char 	*_EXFUN(strrchr,(const char *, int));
-size_t	 _EXFUN(strspn,(const char *, const char *));
-char 	*_EXFUN(strstr,(const char *, const char *));
+void *	 memchr (const void *, int, size_t);
+int 	 memcmp (const void *, const void *, size_t);
+void *	 memcpy (void *__restrict, const void *__restrict, size_t);
+void *	 memmove (void *, const void *, size_t);
+void *	 memset (void *, int, size_t);
+char 	*strcat (char *__restrict, const char *__restrict);
+char 	*strchr (const char *, int);
+int	 strcmp (const char *, const char *);
+int	 strcoll (const char *, const char *);
+char 	*strcpy (char *__restrict, const char *__restrict);
+size_t	 strcspn (const char *, const char *);
+char 	*strerror (int);
+size_t	 strlen (const char *);
+char 	*strncat (char *__restrict, const char *__restrict, size_t);
+int	 strncmp (const char *, const char *, size_t);
+char 	*strncpy (char *__restrict, const char *__restrict, size_t);
+char 	*strpbrk (const char *, const char *);
+char 	*strrchr (const char *, int);
+size_t	 strspn (const char *, const char *);
+char 	*strstr (const char *, const char *);
 #ifndef _REENT_ONLY
-char 	*_EXFUN(strtok,(char *__restrict, const char *__restrict));
+char 	*strtok (char *__restrict, const char *__restrict);
 #endif
-size_t	 _EXFUN(strxfrm,(char *__restrict, const char *__restrict, size_t));
+size_t	 strxfrm (char *__restrict, const char *__restrict, size_t);
 
 #if __POSIX_VISIBLE >= 200809
 int	 strcoll_l (const char *, const char *, locale_t);
@@ -57,89 +57,89 @@ char	*strerror_l (int, locale_t);
 size_t	 strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE
-char 	*_EXFUN(strtok_r,(char *__restrict, const char *__restrict, char **__restrict));
+char 	*strtok_r (char *__restrict, const char *__restrict, char **__restrict);
 #endif
 #if __BSD_VISIBLE
-int	 _EXFUN(timingsafe_bcmp,(const void *, const void *, size_t));
-int	 _EXFUN(timingsafe_memcmp,(const void *, const void *, size_t));
+int	 timingsafe_bcmp (const void *, const void *, size_t);
+int	 timingsafe_memcmp (const void *, const void *, size_t);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE
-void *	 _EXFUN(memccpy,(void *__restrict, const void *__restrict, int, size_t));
+void *	 memccpy (void *__restrict, const void *__restrict, int, size_t);
 #endif
 #if __GNU_VISIBLE
-void *	 _EXFUN(mempcpy,(void *, const void *, size_t));
-void *	 _EXFUN(memmem, (const void *, size_t, const void *, size_t));
-void *	 _EXFUN(memrchr,(const void *, int, size_t));
-void *	 _EXFUN(rawmemchr,(const void *, int));
+void *	 mempcpy (void *, const void *, size_t);
+void *	 memmem (const void *, size_t, const void *, size_t);
+void *	 memrchr (const void *, int, size_t);
+void *	 rawmemchr (const void *, int);
 #endif
 #if __POSIX_VISIBLE >= 200809
-char 	*_EXFUN(stpcpy,(char *__restrict, const char *__restrict));
-char 	*_EXFUN(stpncpy,(char *__restrict, const char *__restrict, size_t));
+char 	*stpcpy (char *__restrict, const char *__restrict);
+char 	*stpncpy (char *__restrict, const char *__restrict, size_t);
 #endif
 #if __GNU_VISIBLE
-char	*_EXFUN(strcasestr,(const char *, const char *));
-char 	*_EXFUN(strchrnul,(const char *, int));
+char	*strcasestr (const char *, const char *);
+char 	*strchrnul (const char *, int);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 4
-char 	*_EXFUN(strdup,(const char *));
+char 	*strdup (const char *);
 #endif
-char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
+char 	*_strdup_r (struct _reent *, const char *);
 #if __POSIX_VISIBLE >= 200809
-char 	*_EXFUN(strndup,(const char *, size_t));
+char 	*strndup (const char *, size_t);
 #endif
-char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
+char 	*_strndup_r (struct _reent *, const char *, size_t);
 
 /* There are two common strerror_r variants.  If you request
    _GNU_SOURCE, you get the GNU version; otherwise you get the POSIX
    version.  POSIX requires that #undef strerror_r will still let you
    invoke the underlying function, but that requires gcc support.  */
 #if __GNU_VISIBLE
-char	*_EXFUN(strerror_r,(int, char *, size_t));
+char	*strerror_r (int, char *, size_t);
 #elif __POSIX_VISIBLE >= 200112
 # ifdef __GNUC__
-int	_EXFUN(strerror_r,(int, char *, size_t))
+int	strerror_r (int, char *, size_t)
 #ifdef __ASMNAME
              __asm__ (__ASMNAME ("__xpg_strerror_r"))
 #endif
   ;
 # else
-int	_EXFUN(__xpg_strerror_r,(int, char *, size_t));
+int	__xpg_strerror_r (int, char *, size_t);
 #  define strerror_r __xpg_strerror_r
 # endif
 #endif
 
 /* Reentrant version of strerror.  */
-char *	_EXFUN(_strerror_r, (struct _reent *, int, int, int *));
+char *	_strerror_r (struct _reent *, int, int, int *);
 
 #if __BSD_VISIBLE
-size_t	_EXFUN(strlcat,(char *, const char *, size_t));
-size_t	_EXFUN(strlcpy,(char *, const char *, size_t));
+size_t	strlcat (char *, const char *, size_t);
+size_t	strlcpy (char *, const char *, size_t);
 #endif
 #if __POSIX_VISIBLE >= 200809
-size_t	 _EXFUN(strnlen,(const char *, size_t));
+size_t	 strnlen (const char *, size_t);
 #endif
 #if __BSD_VISIBLE
-char 	*_EXFUN(strsep,(char **, const char *));
+char 	*strsep (char **, const char *);
 #endif
 #if __BSD_VISIBLE
 char    *strnstr(const char *, const char *, size_t) __pure;
 #endif
 
 #if __MISC_VISIBLE
-char	*_EXFUN(strlwr,(char *));
-char	*_EXFUN(strupr,(char *));
+char	*strlwr (char *);
+char	*strupr (char *);
 #endif
 
 #ifndef DEFS_H	/* Kludge to work around problem compiling in gdb */
-char	*_EXFUN(strsignal, (int __signo));
+char	*strsignal (int __signo);
 #endif
 
 #ifdef __CYGWIN__
-int	_EXFUN(strtosigno, (const char *__name));
+int	strtosigno (const char *__name);
 #endif
 
 #if __GNU_VISIBLE
-int	 _EXFUN(strverscmp,(const char *, const char *));
+int	 strverscmp (const char *, const char *);
 #endif
 
 #if __GNU_VISIBLE && defined(__GNUC__)
@@ -169,7 +169,7 @@ int	 _EXFUN(strverscmp,(const char *, const char *));
    sure here. */
 #if __GNU_VISIBLE && !defined(basename)
 # define basename basename
-char	*_EXFUN(__nonnull ((1)) basename,(const char *)) __asm__(__ASMNAME("__gnu_basename"));
+char	*__nonnull ((1)) basename (const char *) __asm__(__ASMNAME("__gnu_basename"));
 #endif
 
 #include <sys/string.h>
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
index aa0b78441..d4ee0b7c9 100644
--- a/newlib/libc/include/sys/iconvnls.h
+++ b/newlib/libc/include/sys/iconvnls.h
@@ -45,33 +45,33 @@
 #define ICONV_NLS_TO   1
 
 void
-_EXFUN(_iconv_nls_get_state, (iconv_t cd, mbstate_t *ps, int direction));
+_iconv_nls_get_state (iconv_t cd, mbstate_t *ps, int direction);
 
 int
-_EXFUN(_iconv_nls_set_state, (iconv_t cd, mbstate_t *ps, int direction));
+_iconv_nls_set_state (iconv_t cd, mbstate_t *ps, int direction);
 
 int
-_EXFUN(_iconv_nls_is_stateful, (iconv_t cd, int direction));
+_iconv_nls_is_stateful (iconv_t cd, int direction);
 
 int
-_EXFUN(_iconv_nls_get_mb_cur_max, (iconv_t cd, int direction));
+_iconv_nls_get_mb_cur_max (iconv_t cd, int direction);
 
 size_t
-_EXFUN(_iconv_nls_conv, (struct _reent *rptr, iconv_t cd,
+_iconv_nls_conv (struct _reent *rptr, iconv_t cd,
                         const char **inbuf, size_t *inbytesleft,
-                        char **outbuf, size_t *outbytesleft));
+                        char **outbuf, size_t *outbytesleft);
 
 const char *
-_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, const char *file,
-                                      const char *dir, const char *ext));
+_iconv_nls_construct_filename (struct _reent *rptr, const char *file,
+                                      const char *dir, const char *ext);
 
 
 int
-_EXFUN(_iconv_nls_open, (struct _reent *rptr, const char *encoding,
-                        iconv_t *towc, iconv_t *fromwc, int flag));
+_iconv_nls_open (struct _reent *rptr, const char *encoding,
+                        iconv_t *towc, iconv_t *fromwc, int flag);
 
 char *
-_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, const char *ca));
+_iconv_resolve_encoding_name (struct _reent *rptr, const char *ca);
 
 #endif /* __SYS_ICONVNLS_H__ */
 
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 54fdf96f1..1ef226194 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -165,7 +165,7 @@ struct __sFILE_fake {
 /* Following is needed both in libc/stdio and libc/stdlib so we put it
  * here instead of libc/stdio/local.h where it was previously. */
 
-extern void   _EXFUN(__sinit,(struct _reent *));
+extern void   __sinit (struct _reent *);
 
 # define _REENT_SMALL_CHECK_INIT(ptr)		\
   do						\
@@ -781,7 +781,7 @@ void _reclaim_reent (struct _reent *);
 
 #if defined(__DYNAMIC_REENT__) && !defined(__SINGLE_THREAD__)
 #ifndef __getreent
-  struct _reent * _EXFUN(__getreent, (void));
+  struct _reent * __getreent (void);
 #endif
 # define _REENT (__getreent())
 #else /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
diff --git a/newlib/libc/include/sys/resource.h b/newlib/libc/include/sys/resource.h
index c35ac2a46..b99506bd8 100644
--- a/newlib/libc/include/sys/resource.h
+++ b/newlib/libc/include/sys/resource.h
@@ -11,7 +11,7 @@ struct rusage {
 	struct timeval ru_stime;	/* system time used */
 };
 
-int	_EXFUN(getrusage, (int, struct rusage*));
+int	getrusage (int, struct rusage*);
 
 #endif
 
diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h
index ab35718ae..ffb7beccb 100644
--- a/newlib/libc/include/sys/signal.h
+++ b/newlib/libc/include/sys/signal.h
@@ -161,36 +161,36 @@ typedef struct sigaltstack {
 #define SIG_BLOCK 1	/* set of signals to block */
 #define SIG_UNBLOCK 2	/* set of signals to, well, unblock */
 
-int _EXFUN(sigprocmask, (int how, const sigset_t *set, sigset_t *oset));
+int sigprocmask (int how, const sigset_t *set, sigset_t *oset);
 #endif
 
 #if __POSIX_VISIBLE >= 199506
-int _EXFUN(pthread_sigmask, (int how, const sigset_t *set, sigset_t *oset));
+int pthread_sigmask (int how, const sigset_t *set, sigset_t *oset);
 #endif
 
 #if defined(__CYGWIN__) || defined(__rtems__)
 #ifdef _COMPILING_NEWLIB
-int _EXFUN(_kill, (pid_t, int));
+int _kill (pid_t, int);
 #endif /* _COMPILING_NEWLIB */
 #endif /* __CYGWIN__ || __rtems__ */
 
 #if __POSIX_VISIBLE
-int _EXFUN(kill, (pid_t, int));
+int kill (pid_t, int);
 #endif
 
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4
-int _EXFUN(killpg, (pid_t, int));
+int killpg (pid_t, int);
 #endif
 #if __POSIX_VISIBLE
-int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
-int _EXFUN(sigaddset, (sigset_t *, const int));
-int _EXFUN(sigdelset, (sigset_t *, const int));
-int _EXFUN(sigismember, (const sigset_t *, int));
-int _EXFUN(sigfillset, (sigset_t *));
-int _EXFUN(sigemptyset, (sigset_t *));
-int _EXFUN(sigpending, (sigset_t *));
-int _EXFUN(sigsuspend, (const sigset_t *));
-int _EXFUN(sigwait, (const sigset_t *set, int *sig));
+int sigaction (int, const struct sigaction *, struct sigaction *);
+int sigaddset (sigset_t *, const int);
+int sigdelset (sigset_t *, const int);
+int sigismember (const sigset_t *, int);
+int sigfillset (sigset_t *);
+int sigemptyset (sigset_t *);
+int sigpending (sigset_t *);
+int sigsuspend (const sigset_t *);
+int sigwait (const sigset_t *set, int *sig);
 
 #if !defined(__CYGWIN__) && !defined(__rtems__)
 /* These depend upon the type of sigset_t, which right now 
@@ -211,21 +211,21 @@ int _EXFUN(sigwait, (const sigset_t *set, int *sig));
    value. */
 #if __XSI_VISIBLE && !defined(__INSIDE_CYGWIN__)
 # ifdef __GNUC__
-int _EXFUN(sigpause, (int)) __asm__ (__ASMNAME ("__xpg_sigpause"));
+int sigpause (int) __asm__ (__ASMNAME ("__xpg_sigpause"));
 # else
-int _EXFUN(__xpg_sigpause, (int));
+int __xpg_sigpause (int);
 #  define sigpause __xpg_sigpause
 # endif
 #elif __BSD_VISIBLE
-int _EXFUN(sigpause, (int));
+int sigpause (int);
 #endif
 
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int _EXFUN(sigaltstack, (const stack_t *__restrict, stack_t *__restrict));
+int sigaltstack (const stack_t *__restrict, stack_t *__restrict);
 #endif
 
 #if __POSIX_VISIBLE >= 199506
-int _EXFUN(pthread_kill, (pthread_t thread, int sig));
+int pthread_kill (pthread_t thread, int sig);
 #endif
 
 #if __POSIX_VISIBLE >= 199309
@@ -233,12 +233,11 @@ int _EXFUN(pthread_kill, (pthread_t thread, int sig));
 /*  3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76
     NOTE: P1003.1c/D10, p. 39 adds sigwait().  */
 
-int _EXFUN(sigwaitinfo, (const sigset_t *set, siginfo_t *info));
-int _EXFUN(sigtimedwait,
-  (const sigset_t *set, siginfo_t *info, const struct timespec  *timeout)
-);
+int sigwaitinfo (const sigset_t *set, siginfo_t *info);
+int sigtimedwait (const sigset_t *set, siginfo_t *info,
+		  const struct timespec  *timeout);
 /*  3.3.9 Queue a Signal to a Process, P1003.1b-1993, p. 78 */
-int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value));
+int sigqueue (pid_t pid, int signo, const union sigval value);
 
 #endif /* __POSIX_VISIBLE >= 199309 */
 
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index 94a90c0dd..eee98db64 100644
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -144,41 +144,41 @@ struct	stat
 #define UTIME_OMIT	-1L
 #endif
 
-int	_EXFUN(chmod,( const char *__path, mode_t __mode ));
-int     _EXFUN(fchmod,(int __fd, mode_t __mode));
-int	_EXFUN(fstat,( int __fd, struct stat *__sbuf ));
-int	_EXFUN(mkdir,( const char *_path, mode_t __mode ));
-int	_EXFUN(mkfifo,( const char *__path, mode_t __mode ));
-int	_EXFUN(stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
-mode_t	_EXFUN(umask,( mode_t __mask ));
+int	chmod (const char *__path, mode_t __mode );
+int     fchmod (int __fd, mode_t __mode);
+int	fstat (int __fd, struct stat *__sbuf );
+int	mkdir (const char *_path, mode_t __mode );
+int	mkfifo (const char *__path, mode_t __mode );
+int	stat (const char *__restrict __path, struct stat *__restrict __sbuf );
+mode_t	umask (mode_t __mask );
 
 #if defined (__SPU__) || defined(__rtems__) || defined(__CYGWIN__) && !defined(__INSIDE_CYGWIN__)
-int	_EXFUN(lstat,( const char *__restrict __path, struct stat *__restrict __buf ));
-int	_EXFUN(mknod,( const char *__path, mode_t __mode, dev_t __dev ));
+int	lstat (const char *__restrict __path, struct stat *__restrict __buf );
+int	mknod (const char *__path, mode_t __mode, dev_t __dev );
 #endif
 
 #if __ATFILE_VISIBLE && !defined(__INSIDE_CYGWIN__)
-int	_EXFUN(fchmodat, (int, const char *, mode_t, int));
-int	_EXFUN(fstatat, (int, const char *__restrict , struct stat *__restrict, int));
-int	_EXFUN(mkdirat, (int, const char *, mode_t));
-int	_EXFUN(mkfifoat, (int, const char *, mode_t));
-int	_EXFUN(mknodat, (int, const char *, mode_t, dev_t));
-int	_EXFUN(utimensat, (int, const char *, const struct timespec *, int));
+int	fchmodat (int, const char *, mode_t, int);
+int	fstatat (int, const char *__restrict , struct stat *__restrict, int);
+int	mkdirat (int, const char *, mode_t);
+int	mkfifoat (int, const char *, mode_t);
+int	mknodat (int, const char *, mode_t, dev_t);
+int	utimensat (int, const char *, const struct timespec *, int);
 #endif
 #if __POSIX_VISIBLE >= 200809 && !defined(__INSIDE_CYGWIN__)
-int	_EXFUN(futimens, (int, const struct timespec *));
+int	futimens (int, const struct timespec *);
 #endif
 
 /* Provide prototypes for most of the _<systemcall> names that are
    provided in newlib for some compilers.  */
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(_fstat,( int __fd, struct stat *__sbuf ));
-int	_EXFUN(_stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
-int	_EXFUN(_mkdir,( const char *_path, mode_t __mode ));
+int	_fstat (int __fd, struct stat *__sbuf );
+int	_stat (const char *__restrict __path, struct stat *__restrict __sbuf );
+int	_mkdir (const char *_path, mode_t __mode );
 #ifdef __LARGE64_FILES
 struct stat64;
-int	_EXFUN(_stat64,( const char *__restrict __path, struct stat64 *__restrict __sbuf ));
-int	_EXFUN(_fstat64,( int __fd, struct stat64 *__sbuf ));
+int	_stat64 (const char *__restrict __path, struct stat64 *__restrict __sbuf );
+int	_fstat64 (int __fd, struct stat64 *__sbuf );
 #endif
 #endif
 
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index 5fdb6673b..ce2e667f7 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -268,30 +268,30 @@ struct itimerval {
 #include <time.h>
 
 __BEGIN_DECLS
-int _EXFUN(utimes, (const char *__path, const struct timeval *__tvp));
+int utimes (const char *__path, const struct timeval *__tvp);
 
 #if __BSD_VISIBLE
-int _EXFUN(adjtime, (const struct timeval *, struct timeval *));
-int _EXFUN(futimes, (int, const struct timeval *));
-int _EXFUN(lutimes, (const char *, const struct timeval *));
-int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
+int adjtime (const struct timeval *, struct timeval *);
+int futimes (int, const struct timeval *);
+int lutimes (const char *, const struct timeval *);
+int settimeofday (const struct timeval *, const struct timezone *);
 #endif
 
 #if __MISC_VISIBLE || __XSI_VISIBLE
-int _EXFUN(getitimer, (int __which, struct itimerval *__value));
-int _EXFUN(setitimer, (int __which, const struct itimerval *__restrict __value,
-					struct itimerval *__restrict __ovalue));
+int getitimer (int __which, struct itimerval *__value);
+int setitimer (int __which, const struct itimerval *__restrict __value,
+					struct itimerval *__restrict __ovalue);
 #endif
 
-int _EXFUN(gettimeofday, (struct timeval *__restrict __p,
-			  void *__restrict __tz));
+int gettimeofday (struct timeval *__restrict __p,
+			  void *__restrict __tz);
 
 #if __GNU_VISIBLE
-int _EXFUN(futimesat, (int, const char *, const struct timeval [2]));
+int futimesat (int, const char *, const struct timeval [2]);
 #endif
 
 #ifdef _COMPILING_NEWLIB
-int _EXFUN(_gettimeofday, (struct timeval *__p, void *__tz));
+int _gettimeofday (struct timeval *__p, void *__tz);
 #endif
 
 __END_DECLS
diff --git a/newlib/libc/include/sys/times.h b/newlib/libc/include/sys/times.h
index b1f1dc699..05b254714 100644
--- a/newlib/libc/include/sys/times.h
+++ b/newlib/libc/include/sys/times.h
@@ -21,9 +21,9 @@ struct tms {
 	clock_t	tms_cstime;		/* system time, children */
 };
 
-clock_t _EXFUN(times,(struct tms *));
+clock_t times (struct tms *);
 #ifdef _COMPILING_NEWLIB
-clock_t _EXFUN(_times,(struct tms *));
+clock_t _times (struct tms *);
 #endif
 
 #ifdef __cplusplus
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 05962219a..f216fb95c 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -15,234 +15,234 @@ extern "C" {
 
 extern char **environ;
 
-void	_EXFUN(_exit, (int __status ) _ATTRIBUTE ((__noreturn__)));
+void	_exit (int __status) _ATTRIBUTE ((__noreturn__));
 
-int	_EXFUN(access,(const char *__path, int __amode ));
-unsigned  _EXFUN(alarm, (unsigned __secs ));
-int     _EXFUN(chdir, (const char *__path ));
-int     _EXFUN(chmod, (const char *__path, mode_t __mode ));
+int	access (const char *__path, int __amode);
+unsigned  alarm (unsigned __secs);
+int     chdir (const char *__path);
+int     chmod (const char *__path, mode_t __mode);
 #if !defined(__INSIDE_CYGWIN__)
-int     _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
+int     chown (const char *__path, uid_t __owner, gid_t __group);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-int     _EXFUN(chroot, (const char *__path ));
+int     chroot (const char *__path);
 #endif
-int     _EXFUN(close, (int __fildes ));
+int     close (int __fildes);
 #if __POSIX_VISIBLE >= 199209
-size_t	_EXFUN(confstr, (int __name, char *__buf, size_t __len));
+size_t	confstr (int __name, char *__buf, size_t __len);
 #endif
 #if __XSI_VISIBLE
-char *  _EXFUN(crypt, (const char *__key, const char *__salt));
+char *  crypt (const char *__key, const char *__salt);
 #endif
 #if __XSI_VISIBLE && __XSI_VISIBLE < 700
-char *  _EXFUN(ctermid, (char *__s ));
+char *  ctermid (char *__s);
 #endif
 #if __XSI_VISIBLE && __XSI_VISIBLE < 600
-char *  _EXFUN(cuserid, (char *__s ));
+char *  cuserid (char *__s);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-int	_EXFUN(daemon, (int nochdir, int noclose));
+int	daemon (int nochdir, int noclose);
 #endif
-int     _EXFUN(dup, (int __fildes ));
-int     _EXFUN(dup2, (int __fildes, int __fildes2 ));
+int     dup (int __fildes);
+int     dup2 (int __fildes, int __fildes2);
 #if __GNU_VISIBLE
-int     _EXFUN(dup3, (int __fildes, int __fildes2, int flags));
-int	_EXFUN(eaccess, (const char *__path, int __mode));
+int     dup3 (int __fildes, int __fildes2, int flags);
+int	eaccess (const char *__path, int __mode);
 #endif
 #if __XSI_VISIBLE
-void	_EXFUN(encrypt, (char *__block, int __edflag));
+void	encrypt (char *__block, int __edflag);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-void	_EXFUN(endusershell, (void));
+void	endusershell (void);
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(euidaccess, (const char *__path, int __mode));
+int	euidaccess (const char *__path, int __mode);
 #endif
-int     _EXFUN(execl, (const char *__path, const char *, ... ));
-int     _EXFUN(execle, (const char *__path, const char *, ... ));
-int     _EXFUN(execlp, (const char *__file, const char *, ... ));
+int     execl (const char *__path, const char *, ...);
+int     execle (const char *__path, const char *, ...);
+int     execlp (const char *__file, const char *, ...);
 #if __MISC_VISIBLE
-int     _EXFUN(execlpe, (const char *__file, const char *, ... ));
+int     execlpe (const char *__file, const char *, ...);
 #endif
-int     _EXFUN(execv, (const char *__path, char * const __argv[] ));
-int     _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-int     _EXFUN(execvp, (const char *__file, char * const __argv[] ));
+int     execv (const char *__path, char * const __argv[]);
+int     execve (const char *__path, char * const __argv[], char * const __envp[]);
+int     execvp (const char *__file, char * const __argv[]);
 #if __GNU_VISIBLE
-int     _EXFUN(execvpe, (const char *__file, char * const __argv[], char * const __envp[] ));
+int     execvpe (const char *__file, char * const __argv[], char * const __envp[]);
 #endif
 #if __ATFILE_VISIBLE
-int	_EXFUN(faccessat, (int __dirfd, const char *__path, int __mode, int __flags));
+int	faccessat (int __dirfd, const char *__path, int __mode, int __flags);
 #endif
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int     _EXFUN(fchdir, (int __fildes));
+int     fchdir (int __fildes);
 #endif
 #if __POSIX_VISIBLE >= 199309
-int     _EXFUN(fchmod, (int __fildes, mode_t __mode ));
+int     fchmod (int __fildes, mode_t __mode);
 #endif
 #if !defined(__INSIDE_CYGWIN__)
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int     _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
+int     fchown (int __fildes, uid_t __owner, gid_t __group);
 #endif
 #endif
 #if __ATFILE_VISIBLE
-int	_EXFUN(fchownat, (int __dirfd, const char *__path, uid_t __owner, gid_t __group, int __flags));
+int	fchownat (int __dirfd, const char *__path, uid_t __owner, gid_t __group, int __flags);
 #endif
 #if __POSIX_VISIBLE >= 200809
-int	_EXFUN(fexecve, (int __fd, char * const __argv[], char * const __envp[] ));
+int	fexecve (int __fd, char * const __argv[], char * const __envp[]);
 #endif
-pid_t   _EXFUN(fork, (void ));
-long    _EXFUN(fpathconf, (int __fd, int __name ));
-int     _EXFUN(fsync, (int __fd));
+pid_t   fork (void);
+long    fpathconf (int __fd, int __name);
+int     fsync (int __fd);
 #if __POSIX_VISIBLE >= 199309
-int     _EXFUN(fdatasync, (int __fd));
+int     fdatasync (int __fd);
 #endif
 #if __GNU_VISIBLE
-char *  _EXFUN(get_current_dir_name, (void));
+char *  get_current_dir_name (void);
 #endif
-char *  _EXFUN(getcwd, (char *__buf, size_t __size ));
+char *  getcwd (char *__buf, size_t __size);
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-int	_EXFUN(getdomainname ,(char *__name, size_t __len));
+int	getdomainname  (char *__name, size_t __len);
 #endif
 #if __BSD_VISIBLE
-int     _EXFUN(getentropy, (void *, size_t));
+int     getentropy (void *, size_t);
 #endif
 #if !defined(__INSIDE_CYGWIN__)
-gid_t   _EXFUN(getegid, (void ));
-uid_t   _EXFUN(geteuid, (void ));
-gid_t   _EXFUN(getgid, (void ));
+gid_t   getegid (void);
+uid_t   geteuid (void);
+gid_t   getgid (void);
 #endif
-int     _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
+int     getgroups (int __gidsetsize, gid_t __grouplist[]);
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4
-long    _EXFUN(gethostid, (void));
+long    gethostid (void);
 #endif
-char *  _EXFUN(getlogin, (void ));
+char *  getlogin (void);
 #if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-int _EXFUN(getlogin_r, (char *name, size_t namesize) );
+int getlogin_r (char *name, size_t namesize) ;
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __POSIX_VISIBLE < 200112)
-char *  _EXFUN(getpass, (const char *__prompt));
-int	_EXFUN(getpagesize, (void));
+char *  getpass (const char *__prompt);
+int	getpagesize (void);
 #endif
 #if __BSD_VISIBLE
-int    _EXFUN(getpeereid, (int, uid_t *, gid_t *));
+int    getpeereid (int, uid_t *, gid_t *);
 #endif
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 4
-pid_t   _EXFUN(getpgid, (pid_t));
+pid_t   getpgid (pid_t);
 #endif
-pid_t   _EXFUN(getpgrp, (void ));
-pid_t   _EXFUN(getpid, (void ));
-pid_t   _EXFUN(getppid, (void ));
+pid_t   getpgrp (void);
+pid_t   getpid (void);
+pid_t   getppid (void);
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 4
-pid_t   _EXFUN(getsid, (pid_t));
+pid_t   getsid (pid_t);
 #endif
 #if !defined(__INSIDE_CYGWIN__)
-uid_t   _EXFUN(getuid, (void ));
+uid_t   getuid (void);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-char *	_EXFUN(getusershell, (void));
+char *	getusershell (void);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200809)
-char *  _EXFUN(getwd, (char *__buf ));
+char *  getwd (char *__buf);
 #endif
 #if __BSD_VISIBLE
-int	_EXFUN(iruserok, (unsigned long raddr, int superuser, const char *ruser, const char *luser));
+int	iruserok (unsigned long raddr, int superuser, const char *ruser, const char *luser);
 #endif
-int     _EXFUN(isatty, (int __fildes ));
+int     isatty (int __fildes);
 #if __BSD_VISIBLE
-int        _EXFUN(issetugid, (void));
+int        issetugid (void);
 #endif
 #if !defined(__INSIDE_CYGWIN__)
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int     _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
+int     lchown (const char *__path, uid_t __owner, gid_t __group);
 #endif
 #endif
-int     _EXFUN(link, (const char *__path1, const char *__path2 ));
+int     link (const char *__path1, const char *__path2);
 #if __ATFILE_VISIBLE
-int     _EXFUN(linkat, (int __dirfd1, const char *__path1, int __dirfd2, const char *__path2, int __flags ));
+int     linkat (int __dirfd1, const char *__path1, int __dirfd2, const char *__path2, int __flags);
 #endif
 #if __MISC_VISIBLE || __XSI_VISIBLE
-int	_EXFUN(nice, (int __nice_value ));
+int	nice (int __nice_value);
 #endif
 #if !defined(__INSIDE_CYGWIN__)
-off_t   _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
+off_t   lseek (int __fildes, off_t __offset, int __whence);
 #endif
 #if __MISC_VISIBLE || __XSI_VISIBLE >= 4
 #define F_ULOCK	0
 #define F_LOCK	1
 #define F_TLOCK	2
 #define F_TEST	3
-int     _EXFUN(lockf, (int __fd, int __cmd, off_t __len));
+int     lockf (int __fd, int __cmd, off_t __len);
 #endif
-long    _EXFUN(pathconf, (const char *__path, int __name ));
-int     _EXFUN(pause, (void ));
+long    pathconf (const char *__path, int __name);
+int     pause (void);
 #if __POSIX_VISIBLE >= 199506
-int	_EXFUN(pthread_atfork, (void (*)(void), void (*)(void), void (*)(void)));
+int	pthread_atfork (void (*)(void), void (*)(void), void (*)(void));
 #endif
-int     _EXFUN(pipe, (int __fildes[2] ));
+int     pipe (int __fildes[2]);
 #if __GNU_VISIBLE
-int     _EXFUN(pipe2, (int __fildes[2], int flags));
+int     pipe2 (int __fildes[2], int flags);
 #endif
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 500
-ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
-ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
+ssize_t pread (int __fd, void *__buf, size_t __nbytes, off_t __offset);
+ssize_t pwrite (int __fd, const void *__buf, size_t __nbytes, off_t __offset);
 #endif
-_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
+_READ_WRITE_RETURN_TYPE read (int __fd, void *__buf, size_t __nbyte);
 #if __BSD_VISIBLE
-int	_EXFUN(rresvport, (int *__alport));
-int	_EXFUN(revoke, (char *__path));
+int	rresvport (int *__alport);
+int	revoke (char *__path);
 #endif
-int     _EXFUN(rmdir, (const char *__path ));
+int     rmdir (const char *__path);
 #if __BSD_VISIBLE
-int	_EXFUN(ruserok, (const char *rhost, int superuser, const char *ruser, const char *luser));
+int	ruserok (const char *rhost, int superuser, const char *ruser, const char *luser);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
+void *  sbrk (ptrdiff_t __incr);
 #endif
 #if !defined(__INSIDE_CYGWIN__)
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
-int     _EXFUN(setegid, (gid_t __gid ));
-int     _EXFUN(seteuid, (uid_t __uid ));
+int     setegid (gid_t __gid);
+int     seteuid (uid_t __uid);
 #endif
-int     _EXFUN(setgid, (gid_t __gid ));
+int     setgid (gid_t __gid);
 #endif
 #if __BSD_VISIBLE
-int	_EXFUN(setgroups, (int ngroups, const gid_t *grouplist ));
+int	setgroups (int ngroups, const gid_t *grouplist);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-int	_EXFUN(sethostname, (const char *, size_t));
+int	sethostname (const char *, size_t);
 #endif
-int     _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
+int     setpgid (pid_t __pid, pid_t __pgid);
 #if __SVID_VISIBLE || __XSI_VISIBLE >= 500
-int     _EXFUN(setpgrp, (void ));
+int     setpgrp (void);
 #endif
 #if (__BSD_VISIBLE || __XSI_VISIBLE >= 4) && !defined(__INSIDE_CYGWIN__)
-int	_EXFUN(setregid, (gid_t __rgid, gid_t __egid));
-int	_EXFUN(setreuid, (uid_t __ruid, uid_t __euid));
+int	setregid (gid_t __rgid, gid_t __egid);
+int	setreuid (uid_t __ruid, uid_t __euid);
 #endif
-pid_t   _EXFUN(setsid, (void ));
+pid_t   setsid (void);
 #if !defined(__INSIDE_CYGWIN__)
-int     _EXFUN(setuid, (uid_t __uid ));
+int     setuid (uid_t __uid);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-void	_EXFUN(setusershell, (void));
+void	setusershell (void);
 #endif
-unsigned _EXFUN(sleep, (unsigned int __seconds ));
+unsigned sleep (unsigned int __seconds);
 #if __XSI_VISIBLE
-void    _EXFUN(swab, (const void *__restrict, void *__restrict, ssize_t));
-#endif
-long    _EXFUN(sysconf, (int __name ));
-pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
-int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
-char *  _EXFUN(ttyname, (int __fildes ));
-int     _EXFUN(ttyname_r, (int, char *, size_t));
-int     _EXFUN(unlink, (const char *__path ));
+void    swab (const void *__restrict, void *__restrict, ssize_t);
+#endif
+long    sysconf (int __name);
+pid_t   tcgetpgrp (int __fildes);
+int     tcsetpgrp (int __fildes, pid_t __pgrp_id);
+char *  ttyname (int __fildes);
+int     ttyname_r (int, char *, size_t);
+int     unlink (const char *__path);
 #if __XSI_VISIBLE >= 500 && __POSIX_VISIBLE < 200809 || __BSD_VISIBLE
-int 	_EXFUN(usleep, (useconds_t __useconds));
+int 	usleep (useconds_t __useconds);
 #endif
 #if __BSD_VISIBLE
-int     _EXFUN(vhangup, (void ));
+int     vhangup (void);
 #endif
-_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
+_READ_WRITE_RETURN_TYPE write (int __fd, const void *__buf, size_t __nbyte);
 
 #ifdef __CYGWIN__
 # define __UNISTD_GETOPT__
@@ -256,69 +256,69 @@ extern int optreset;			/* getopt(3) external variable */
 #endif
 
 #if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200809)
-pid_t   _EXFUN(vfork, (void ));
+pid_t   vfork (void);
 #endif
 
 #ifdef _COMPILING_NEWLIB
 /* Provide prototypes for most of the _<systemcall> names that are
    provided in newlib for some compilers.  */
-int     _EXFUN(_close, (int __fildes ));
-pid_t   _EXFUN(_fork, (void ));
-pid_t   _EXFUN(_getpid, (void ));
-int	_EXFUN(_isatty, (int __fildes ));
-int     _EXFUN(_link, (const char *__path1, const char *__path2 ));
-_off_t   _EXFUN(_lseek, (int __fildes, _off_t __offset, int __whence ));
+int     _close (int __fildes);
+pid_t   _fork (void);
+pid_t   _getpid (void);
+int	_isatty (int __fildes);
+int     _link (const char *__path1, const char *__path2);
+_off_t   _lseek (int __fildes, _off_t __offset, int __whence);
 #ifdef __LARGE64_FILES
-_off64_t _EXFUN(_lseek64, (int __filedes, _off64_t __offset, int __whence ));
+_off64_t _lseek64 (int __filedes, _off64_t __offset, int __whence);
 #endif
-_READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
-void *  _EXFUN(_sbrk,  (ptrdiff_t __incr));
-int     _EXFUN(_unlink, (const char *__path ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
-int     _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
+_READ_WRITE_RETURN_TYPE _read (int __fd, void *__buf, size_t __nbyte);
+void *  _sbrk (ptrdiff_t __incr);
+int     _unlink (const char *__path);
+_READ_WRITE_RETURN_TYPE _write (int __fd, const void *__buf, size_t __nbyte);
+int     _execve (const char *__path, char * const __argv[], char * const __envp[]);
 #endif
 
 #if !defined(__INSIDE_CYGWIN__)
 #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 500
-int     _EXFUN(ftruncate, (int __fd, off_t __length));
+int     ftruncate (int __fd, off_t __length);
 #endif
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 500
-int     _EXFUN(truncate, (const char *, off_t __length));
+int     truncate (const char *, off_t __length);
 #endif
 #endif
 
 #if __BSD_VISIBLE || __POSIX_VISIBLE < 200112
-int	_EXFUN(getdtablesize, (void));
+int	getdtablesize (void);
 #endif
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 500
-useconds_t _EXFUN(ualarm, (useconds_t __useconds, useconds_t __interval));
+useconds_t ualarm (useconds_t __useconds, useconds_t __interval);
 #endif
 
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 500
 #if !(defined  (_WINSOCK_H) || defined (_WINSOCKAPI_) || defined (__USE_W32_SOCKETS))
 /* winsock[2].h defines as __stdcall, and with int as 2nd arg */
- int	_EXFUN(gethostname, (char *__name, size_t __len));
+ int	gethostname (char *__name, size_t __len);
 #endif
 #endif
 
 #if __MISC_VISIBLE
-int	_EXFUN(setdtablesize, (int));
+int	setdtablesize (int);
 #endif
 
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 500
-void    _EXFUN(sync, (void));
+void    sync (void);
 #endif
 
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4
-ssize_t _EXFUN(readlink, (const char *__restrict __path,
-                          char *__restrict __buf, size_t __buflen));
-int     _EXFUN(symlink, (const char *__name1, const char *__name2));
+ssize_t readlink (const char *__restrict __path,
+                          char *__restrict __buf, size_t __buflen);
+int     symlink (const char *__name1, const char *__name2);
 #endif
 #if __ATFILE_VISIBLE
-ssize_t        _EXFUN(readlinkat, (int __dirfd1, const char *__restrict __path,
-                            char *__restrict __buf, size_t __buflen));
-int	_EXFUN(symlinkat, (const char *, int, const char *));
-int	_EXFUN(unlinkat, (int, const char *, int));
+ssize_t        readlinkat (int __dirfd1, const char *__restrict __path,
+                            char *__restrict __buf, size_t __buflen);
+int	symlinkat (const char *, int, const char *);
+int	unlinkat (int, const char *, int);
 #endif
 
 #define	F_OK	0
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 6f6ff86c8..a2efcc15e 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -53,19 +53,19 @@ struct tm
 #endif
 };
 
-clock_t	   _EXFUN(clock,    (void));
-double	   _EXFUN(difftime, (time_t _time2, time_t _time1));
-time_t	   _EXFUN(mktime,   (struct tm *_timeptr));
-time_t	   _EXFUN(time,     (time_t *_timer));
+clock_t	   clock (void);
+double	   difftime (time_t _time2, time_t _time1);
+time_t	   mktime (struct tm *_timeptr);
+time_t	   time (time_t *_timer);
 #ifndef _REENT_ONLY
-char	  *_EXFUN(asctime,  (const struct tm *_tblock));
-char	  *_EXFUN(ctime,    (const time_t *_time));
-struct tm *_EXFUN(gmtime,   (const time_t *_timer));
-struct tm *_EXFUN(localtime,(const time_t *_timer));
+char	  *asctime (const struct tm *_tblock);
+char	  *ctime (const time_t *_time);
+struct tm *gmtime (const time_t *_timer);
+struct tm *localtime (const time_t *_timer);
 #endif
-size_t	   _EXFUN(strftime, (char *__restrict _s,
+size_t	   strftime (char *__restrict _s,
 			     size_t _maxsize, const char *__restrict _fmt,
-			     const struct tm *__restrict _t));
+			     const struct tm *__restrict _t);
 
 #if __POSIX_VISIBLE >= 200809
 extern size_t strftime_l (char *__restrict _s, size_t _maxsize,
@@ -73,13 +73,13 @@ extern size_t strftime_l (char *__restrict _s, size_t _maxsize,
 			  const struct tm *__restrict _t, locale_t _l);
 #endif
 
-char	  *_EXFUN(asctime_r,	(const struct tm *__restrict,
-				 char *__restrict));
-char	  *_EXFUN(ctime_r,	(const time_t *, char *));
-struct tm *_EXFUN(gmtime_r,	(const time_t *__restrict,
-				 struct tm *__restrict));
-struct tm *_EXFUN(localtime_r,	(const time_t *__restrict,
-				 struct tm *__restrict));
+char	  *asctime_r 	(const struct tm *__restrict,
+				 char *__restrict);
+char	  *ctime_r 	(const time_t *, char *);
+struct tm *gmtime_r 	(const time_t *__restrict,
+				 struct tm *__restrict);
+struct tm *localtime_r 	(const time_t *__restrict,
+				 struct tm *__restrict);
 
 _END_STD_C
 
@@ -88,9 +88,9 @@ extern "C" {
 #endif
 
 #if __XSI_VISIBLE
-char      *_EXFUN(strptime,     (const char *__restrict,
+char      *strptime (const char *__restrict,
 				 const char *__restrict,
-				 struct tm *__restrict));
+				 struct tm *__restrict);
 #endif
 #if __GNU_VISIBLE
 char *strptime_l (const char *__restrict, const char *__restrict,
@@ -98,9 +98,9 @@ char *strptime_l (const char *__restrict, const char *__restrict,
 #endif
 
 #if __POSIX_VISIBLE
-void      _EXFUN(tzset,	(void));
+void      tzset 	(void);
 #endif
-void      _EXFUN(_tzset_r,	(struct _reent *));
+void      _tzset_r 	(struct _reent *);
 
 typedef struct __tzrule_struct
 {
@@ -120,7 +120,7 @@ typedef struct __tzinfo_struct
   __tzrule_type __tzrule[2];
 } __tzinfo_type;
 
-__tzinfo_type *_EXFUN (__gettzinfo, (void));
+__tzinfo_type *__gettzinfo (void);
 
 /* getdate functions */
 
@@ -128,9 +128,9 @@ __tzinfo_type *_EXFUN (__gettzinfo, (void));
 #if __XSI_VISIBLE >= 4
 #ifndef _REENT_ONLY
 #define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(void));
+int *__getdate_err (void);
 
-struct tm *	_EXFUN(getdate, (const char *));
+struct tm *	getdate (const char *);
 /* getdate_err is set to one of the following values to indicate the error.
      1  the DATEMSK environment variable is null or undefined,
      2  the template file cannot be opened for reading,
@@ -145,7 +145,7 @@ struct tm *	_EXFUN(getdate, (const char *));
 
 #if __GNU_VISIBLE
 /* getdate_r returns the error code as above */
-int		_EXFUN(getdate_r, (const char *, struct tm *));
+int		getdate_r (const char *, struct tm *);
 #endif /* __GNU_VISIBLE */
 #endif /* HAVE_GETDATE */
 
@@ -183,33 +183,31 @@ extern "C" {
 
 /* Clocks, P1003.1b-1993, p. 263 */
 
-int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
-int _EXFUN(clock_gettime, (clockid_t clock_id, struct timespec *tp));
-int _EXFUN(clock_getres,  (clockid_t clock_id, struct timespec *res));
+int clock_settime (clockid_t clock_id, const struct timespec *tp);
+int clock_gettime (clockid_t clock_id, struct timespec *tp);
+int clock_getres (clockid_t clock_id, struct timespec *res);
 
 /* Create a Per-Process Timer, P1003.1b-1993, p. 264 */
 
-int _EXFUN(timer_create,
-  	(clockid_t clock_id,
+int timer_create (clockid_t clock_id,
  	struct sigevent *__restrict evp,
-	timer_t *__restrict timerid));
+	timer_t *__restrict timerid);
 
 /* Delete a Per_process Timer, P1003.1b-1993, p. 266 */
 
-int _EXFUN(timer_delete, (timer_t timerid));
+int timer_delete (timer_t timerid);
 
 /* Per-Process Timers, P1003.1b-1993, p. 267 */
 
-int _EXFUN(timer_settime,
-	(timer_t timerid, int flags,
+int timer_settime (timer_t timerid, int flags,
 	const struct itimerspec *__restrict value,
-	struct itimerspec *__restrict ovalue));
-int _EXFUN(timer_gettime, (timer_t timerid, struct itimerspec *value));
-int _EXFUN(timer_getoverrun, (timer_t timerid));
+	struct itimerspec *__restrict ovalue);
+int timer_gettime (timer_t timerid, struct itimerspec *value);
+int timer_getoverrun (timer_t timerid);
 
 /* High Resolution Sleep, P1003.1b-1993, p. 269 */
 
-int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
+int nanosleep (const struct timespec  *rqtp, struct timespec *rmtp);
 
 #ifdef __cplusplus
 }
@@ -222,9 +220,8 @@ int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
 extern "C" {
 #endif
 
-int _EXFUN(clock_nanosleep,
-  (clockid_t clock_id, int flags, const struct timespec *rqtp,
-   struct timespec *rmtp));
+int clock_nanosleep (clockid_t clock_id, int flags,
+	const struct timespec *rqtp, struct timespec *rmtp);
 
 #ifdef __cplusplus
 }
@@ -297,7 +294,7 @@ extern "C" {
 
 /* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */
 
-int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
+int clock_getcpuclockid (pid_t pid, clockid_t *clock_id);
 
 #endif /* _POSIX_CPUTIME */
 
@@ -305,8 +302,8 @@ int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
 
 /* CPU-time Clock Attribute Access, P1003.4b/D8, p. 56 */
 
-int _EXFUN(clock_setenable_attr, (clockid_t clock_id, int attr));
-int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
+int clock_setenable_attr (clockid_t clock_id, int attr);
+int clock_getenable_attr (clockid_t clock_id, int *attr);
 
 #endif /* _POSIX_CPUTIME or _POSIX_THREAD_CPUTIME */
 
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index dccc10627..c84834277 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -86,90 +86,90 @@ struct tm;
 typedef _mbstate_t mbstate_t;
 #endif /* _MBSTATE_T */
 
-wint_t	_EXFUN(btowc, (int));
-int	_EXFUN(wctob, (wint_t));
-size_t	_EXFUN(mbrlen, (const char *__restrict, size_t, mbstate_t *__restrict));
-size_t	_EXFUN(mbrtowc, (wchar_t *__restrict, const char *__restrict, size_t,
-						mbstate_t *__restrict));
-size_t	_EXFUN(_mbrtowc_r, (struct _reent *, wchar_t * , const char * , 
-			size_t, mbstate_t *));
-int	_EXFUN(mbsinit, (const mbstate_t *));
+wint_t	btowc (int);
+int	wctob (wint_t);
+size_t	mbrlen (const char *__restrict, size_t, mbstate_t *__restrict);
+size_t	mbrtowc (wchar_t *__restrict, const char *__restrict, size_t,
+						mbstate_t *__restrict);
+size_t	_mbrtowc_r (struct _reent *, wchar_t * , const char * , 
+			size_t, mbstate_t *);
+int	mbsinit (const mbstate_t *);
 #if __POSIX_VISIBLE >= 200809
-size_t	_EXFUN(mbsnrtowcs, (wchar_t *__restrict, const char **__restrict,
-				size_t, size_t, mbstate_t *__restrict));
-#endif
-size_t	_EXFUN(_mbsnrtowcs_r, (struct _reent *, wchar_t * , const char ** ,
-			size_t, size_t, mbstate_t *));
-size_t	_EXFUN(mbsrtowcs, (wchar_t *__restrict, const char **__restrict, size_t,
-				mbstate_t *__restrict));
-size_t	_EXFUN(_mbsrtowcs_r, (struct _reent *, wchar_t * , const char ** , size_t, mbstate_t *));
-size_t	_EXFUN(wcrtomb, (char *__restrict, wchar_t, mbstate_t *__restrict));
-size_t	_EXFUN(_wcrtomb_r, (struct _reent *, char * , wchar_t, mbstate_t *));
+size_t	mbsnrtowcs (wchar_t *__restrict, const char **__restrict,
+				size_t, size_t, mbstate_t *__restrict);
+#endif
+size_t	_mbsnrtowcs_r (struct _reent *, wchar_t * , const char ** ,
+			size_t, size_t, mbstate_t *);
+size_t	mbsrtowcs (wchar_t *__restrict, const char **__restrict, size_t,
+				mbstate_t *__restrict);
+size_t	_mbsrtowcs_r (struct _reent *, wchar_t * , const char ** , size_t, mbstate_t *);
+size_t	wcrtomb (char *__restrict, wchar_t, mbstate_t *__restrict);
+size_t	_wcrtomb_r (struct _reent *, char * , wchar_t, mbstate_t *);
 #if __POSIX_VISIBLE >= 200809
-size_t	_EXFUN(wcsnrtombs, (char *__restrict, const wchar_t **__restrict,
-				size_t, size_t, mbstate_t *__restrict));
-#endif
-size_t	_EXFUN(_wcsnrtombs_r, (struct _reent *, char * , const wchar_t ** , 
-			size_t, size_t, mbstate_t *));
-size_t	_EXFUN(wcsrtombs, (char *__restrict, const wchar_t **__restrict,
-				size_t, mbstate_t *__restrict));
-size_t	_EXFUN(_wcsrtombs_r, (struct _reent *, char * , const wchar_t ** , 
-			size_t, mbstate_t *));
+size_t	wcsnrtombs (char *__restrict, const wchar_t **__restrict,
+				size_t, size_t, mbstate_t *__restrict);
+#endif
+size_t	_wcsnrtombs_r (struct _reent *, char * , const wchar_t ** , 
+			size_t, size_t, mbstate_t *);
+size_t	wcsrtombs (char *__restrict, const wchar_t **__restrict,
+				size_t, mbstate_t *__restrict);
+size_t	_wcsrtombs_r (struct _reent *, char * , const wchar_t ** , 
+			size_t, mbstate_t *);
 #if __POSIX_VISIBLE >= 200809
-int	_EXFUN(wcscasecmp, (const wchar_t *, const wchar_t *));
+int	wcscasecmp (const wchar_t *, const wchar_t *);
 #endif
-wchar_t	*_EXFUN(wcscat, (wchar_t *__restrict, const wchar_t *__restrict));
-wchar_t	*_EXFUN(wcschr, (const wchar_t *, wchar_t));
-int	_EXFUN(wcscmp, (const wchar_t *, const wchar_t *));
-int	_EXFUN(wcscoll, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcscpy, (wchar_t *__restrict, const wchar_t *__restrict));
+wchar_t	*wcscat (wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t	*wcschr (const wchar_t *, wchar_t);
+int	wcscmp (const wchar_t *, const wchar_t *);
+int	wcscoll (const wchar_t *, const wchar_t *);
+wchar_t	*wcscpy (wchar_t *__restrict, const wchar_t *__restrict);
 #if __POSIX_VISIBLE >= 200809
-wchar_t	*_EXFUN(wcpcpy, (wchar_t *__restrict,
-				 const wchar_t *__restrict));
-wchar_t	*_EXFUN(wcsdup, (const wchar_t *));
-#endif
-wchar_t	*_EXFUN(_wcsdup_r, (struct _reent *, const wchar_t * ));
-size_t	_EXFUN(wcscspn, (const wchar_t *, const wchar_t *));
-size_t  _EXFUN(wcsftime, (wchar_t *__restrict, size_t,
-				const wchar_t *__restrict, const struct tm *__restrict));
+wchar_t	*wcpcpy (wchar_t *__restrict,
+				 const wchar_t *__restrict);
+wchar_t	*wcsdup (const wchar_t *);
+#endif
+wchar_t	*_wcsdup_r (struct _reent *, const wchar_t * );
+size_t	wcscspn (const wchar_t *, const wchar_t *);
+size_t  wcsftime (wchar_t *__restrict, size_t,
+				const wchar_t *__restrict, const struct tm *__restrict);
 #if __GNU_VISIBLE
 size_t  wcsftime_l (wchar_t *__restrict, size_t, const wchar_t *__restrict,
 		    const struct tm *__restrict, locale_t);
 #endif
-size_t	_EXFUN(wcslcat, (wchar_t *, const wchar_t *, size_t));
-size_t	_EXFUN(wcslcpy, (wchar_t *, const wchar_t *, size_t));
-size_t	_EXFUN(wcslen, (const wchar_t *));
+size_t	wcslcat (wchar_t *, const wchar_t *, size_t);
+size_t	wcslcpy (wchar_t *, const wchar_t *, size_t);
+size_t	wcslen (const wchar_t *);
 #if __POSIX_VISIBLE >= 200809
-int	_EXFUN(wcsncasecmp, (const wchar_t *, const wchar_t *, size_t));
+int	wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
 #endif
-wchar_t	*_EXFUN(wcsncat, (wchar_t *__restrict,
-				 const wchar_t *__restrict, size_t));
-int	_EXFUN(wcsncmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wcsncpy, (wchar_t *__restrict,
-				 const wchar_t *__restrict, size_t));
+wchar_t	*wcsncat (wchar_t *__restrict,
+				 const wchar_t *__restrict, size_t);
+int	wcsncmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t	*wcsncpy (wchar_t *__restrict,
+				 const wchar_t *__restrict, size_t);
 #if __POSIX_VISIBLE >= 200809
-wchar_t	*_EXFUN(wcpncpy, (wchar_t *__restrict,
-				 const wchar_t *__restrict, size_t));
-size_t	_EXFUN(wcsnlen, (const wchar_t *, size_t));
-#endif
-wchar_t	*_EXFUN(wcspbrk, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcsrchr, (const wchar_t *, wchar_t));
-size_t	_EXFUN(wcsspn, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcsstr, (const wchar_t *__restrict,
-				 const wchar_t *__restrict));
-wchar_t	*_EXFUN(wcstok, (wchar_t *__restrict, const wchar_t *__restrict,
-				 wchar_t **__restrict));
-double _EXFUN(wcstod, (const wchar_t *__restrict, wchar_t **__restrict));
-double _EXFUN(_wcstod_r, (struct _reent *, const wchar_t *, wchar_t **));
+wchar_t	*wcpncpy (wchar_t *__restrict,
+				 const wchar_t *__restrict, size_t);
+size_t	wcsnlen (const wchar_t *, size_t);
+#endif
+wchar_t	*wcspbrk (const wchar_t *, const wchar_t *);
+wchar_t	*wcsrchr (const wchar_t *, wchar_t);
+size_t	wcsspn (const wchar_t *, const wchar_t *);
+wchar_t	*wcsstr (const wchar_t *__restrict,
+				 const wchar_t *__restrict);
+wchar_t	*wcstok (wchar_t *__restrict, const wchar_t *__restrict,
+				 wchar_t **__restrict);
+double wcstod (const wchar_t *__restrict, wchar_t **__restrict);
+double _wcstod_r (struct _reent *, const wchar_t *, wchar_t **);
 #if __ISO_C_VISIBLE >= 1999
-float _EXFUN(wcstof, (const wchar_t *__restrict, wchar_t **__restrict));
+float wcstof (const wchar_t *__restrict, wchar_t **__restrict);
 #endif
-float _EXFUN(_wcstof_r, (struct _reent *, const wchar_t *, wchar_t **));
+float _wcstof_r (struct _reent *, const wchar_t *, wchar_t **);
 #if __XSI_VISIBLE
-int	_EXFUN(wcswidth, (const wchar_t *, size_t));
+int	wcswidth (const wchar_t *, size_t);
 #endif
-size_t	_EXFUN(wcsxfrm, (wchar_t *__restrict, const wchar_t *__restrict,
-				size_t));
+size_t	wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict,
+				size_t);
 #if __POSIX_VISIBLE >= 200809
 extern int wcscasecmp_l (const wchar_t *, const wchar_t *, locale_t);
 extern int wcsncasecmp_l (const wchar_t *, const wchar_t *, size_t, locale_t);
@@ -179,36 +179,36 @@ extern size_t wcsxfrm_l (wchar_t *__restrict, const wchar_t *__restrict, size_t,
 #endif
 
 #if __XSI_VISIBLE
-int	_EXFUN(wcwidth, (const wchar_t));
+int	wcwidth (const wchar_t);
 #endif
-wchar_t	*_EXFUN(wmemchr, (const wchar_t *, wchar_t, size_t));
-int	_EXFUN(wmemcmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wmemcpy, (wchar_t *__restrict, const wchar_t *__restrict,
-				 size_t));
-wchar_t	*_EXFUN(wmemmove, (wchar_t *, const wchar_t *, size_t));
+wchar_t	*wmemchr (const wchar_t *, wchar_t, size_t);
+int	wmemcmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t	*wmemcpy (wchar_t *__restrict, const wchar_t *__restrict,
+				 size_t);
+wchar_t	*wmemmove (wchar_t *, const wchar_t *, size_t);
 #if __GNU_VISIBLE
-wchar_t	*_EXFUN(wmempcpy, (wchar_t *__restrict, const wchar_t *__restrict,
-				 size_t));
+wchar_t	*wmempcpy (wchar_t *__restrict, const wchar_t *__restrict,
+				 size_t);
 #endif
-wchar_t	*_EXFUN(wmemset, (wchar_t *, wchar_t, size_t));
+wchar_t	*wmemset (wchar_t *, wchar_t, size_t);
 
-long    _EXFUN(wcstol, (const wchar_t *__restrict, wchar_t **__restrict, int));
+long    wcstol (const wchar_t *__restrict, wchar_t **__restrict, int);
 #if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(wcstoll, (const wchar_t *__restrict, wchar_t **__restrict,
-				  int));
+long long wcstoll (const wchar_t *__restrict, wchar_t **__restrict,
+				  int);
 #endif
-unsigned long _EXFUN(wcstoul, (const wchar_t *__restrict, wchar_t **__restrict,
-					  int));
+unsigned long wcstoul (const wchar_t *__restrict, wchar_t **__restrict,
+					  int);
 #if __ISO_C_VISIBLE >= 1999
-unsigned long long _EXFUN(wcstoull, (const wchar_t *__restrict,
-						   wchar_t **__restrict, int));
+unsigned long long wcstoull (const wchar_t *__restrict,
+						   wchar_t **__restrict, int);
 #endif
-long    _EXFUN(_wcstol_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-long long _EXFUN(_wcstoll_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-unsigned long _EXFUN(_wcstoul_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-unsigned long long _EXFUN(_wcstoull_r, (struct _reent *, const wchar_t *, wchar_t **, int));
+long    _wcstol_r (struct _reent *, const wchar_t *, wchar_t **, int);
+long long _wcstoll_r (struct _reent *, const wchar_t *, wchar_t **, int);
+unsigned long _wcstoul_r (struct _reent *, const wchar_t *, wchar_t **, int);
+unsigned long long _wcstoull_r (struct _reent *, const wchar_t *, wchar_t **, int);
 #if __ISO_C_VISIBLE >= 1999
-long double _EXFUN(wcstold, (const wchar_t *, wchar_t **));
+long double wcstold (const wchar_t *, wchar_t **);
 #endif
 
 #if __GNU_VISIBLE
@@ -224,53 +224,53 @@ float wcstof_l (const wchar_t *, wchar_t **, locale_t);
 long double wcstold_l (const wchar_t *, wchar_t **, locale_t);
 #endif
 
-wint_t _EXFUN(fgetwc, (__FILE *));
-wchar_t *_EXFUN(fgetws, (wchar_t *__restrict, int, __FILE *__restrict));
-wint_t _EXFUN(fputwc, (wchar_t, __FILE *));
-int _EXFUN(fputws, (const wchar_t *__restrict, __FILE *__restrict));
+wint_t fgetwc (__FILE *);
+wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict);
+wint_t fputwc (wchar_t, __FILE *);
+int fputws (const wchar_t *__restrict, __FILE *__restrict);
 #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int _EXFUN (fwide, (__FILE *, int));
-#endif
-wint_t _EXFUN (getwc, (__FILE *));
-wint_t _EXFUN (getwchar, (void));
-wint_t _EXFUN(putwc, (wchar_t, __FILE *));
-wint_t _EXFUN(putwchar, (wchar_t));
-wint_t _EXFUN (ungetwc, (wint_t wc, __FILE *));
-
-wint_t _EXFUN(_fgetwc_r, (struct _reent *, __FILE *));
-wint_t _EXFUN(_fgetwc_unlocked_r, (struct _reent *, __FILE *));
-wchar_t *_EXFUN(_fgetws_r, (struct _reent *, wchar_t *, int, __FILE *));
-wchar_t *_EXFUN(_fgetws_unlocked_r, (struct _reent *, wchar_t *, int, __FILE *));
-wint_t _EXFUN(_fputwc_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_fputwc_unlocked_r, (struct _reent *, wchar_t, __FILE *));
-int _EXFUN(_fputws_r, (struct _reent *, const wchar_t *, __FILE *));
-int _EXFUN(_fputws_unlocked_r, (struct _reent *, const wchar_t *, __FILE *));
-int _EXFUN (_fwide_r, (struct _reent *, __FILE *, int));
-wint_t _EXFUN (_getwc_r, (struct _reent *, __FILE *));
-wint_t _EXFUN (_getwc_unlocked_r, (struct _reent *, __FILE *));
-wint_t _EXFUN (_getwchar_r, (struct _reent *ptr));
-wint_t _EXFUN (_getwchar_unlocked_r, (struct _reent *ptr));
-wint_t _EXFUN(_putwc_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_putwc_unlocked_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_putwchar_r, (struct _reent *, wchar_t));
-wint_t _EXFUN(_putwchar_unlocked_r, (struct _reent *, wchar_t));
-wint_t _EXFUN (_ungetwc_r, (struct _reent *, wint_t wc, __FILE *));
+int fwide (__FILE *, int);
+#endif
+wint_t getwc (__FILE *);
+wint_t getwchar (void);
+wint_t putwc (wchar_t, __FILE *);
+wint_t putwchar (wchar_t);
+wint_t ungetwc (wint_t wc, __FILE *);
+
+wint_t _fgetwc_r (struct _reent *, __FILE *);
+wint_t _fgetwc_unlocked_r (struct _reent *, __FILE *);
+wchar_t *_fgetws_r (struct _reent *, wchar_t *, int, __FILE *);
+wchar_t *_fgetws_unlocked_r (struct _reent *, wchar_t *, int, __FILE *);
+wint_t _fputwc_r (struct _reent *, wchar_t, __FILE *);
+wint_t _fputwc_unlocked_r (struct _reent *, wchar_t, __FILE *);
+int _fputws_r (struct _reent *, const wchar_t *, __FILE *);
+int _fputws_unlocked_r (struct _reent *, const wchar_t *, __FILE *);
+int _fwide_r (struct _reent *, __FILE *, int);
+wint_t _getwc_r (struct _reent *, __FILE *);
+wint_t _getwc_unlocked_r (struct _reent *, __FILE *);
+wint_t _getwchar_r (struct _reent *ptr);
+wint_t _getwchar_unlocked_r (struct _reent *ptr);
+wint_t _putwc_r (struct _reent *, wchar_t, __FILE *);
+wint_t _putwc_unlocked_r (struct _reent *, wchar_t, __FILE *);
+wint_t _putwchar_r (struct _reent *, wchar_t);
+wint_t _putwchar_unlocked_r (struct _reent *, wchar_t);
+wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *);
 
 #if __GNU_VISIBLE
-wint_t _EXFUN(fgetwc_unlocked, (__FILE *));
-wchar_t *_EXFUN(fgetws_unlocked, (wchar_t *__restrict, int, __FILE *__restrict));
-wint_t _EXFUN(fputwc_unlocked, (wchar_t, __FILE *));
-int _EXFUN(fputws_unlocked, (const wchar_t *__restrict, __FILE *__restrict));
-wint_t _EXFUN(getwc_unlocked, (__FILE *));
-wint_t _EXFUN(getwchar_unlocked, (void));
-wint_t _EXFUN(putwc_unlocked, (wchar_t, __FILE *));
-wint_t _EXFUN(putwchar_unlocked, (wchar_t));
+wint_t fgetwc_unlocked (__FILE *);
+wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict);
+wint_t fputwc_unlocked (wchar_t, __FILE *);
+int fputws_unlocked (const wchar_t *__restrict, __FILE *__restrict);
+wint_t getwc_unlocked (__FILE *);
+wint_t getwchar_unlocked (void);
+wint_t putwc_unlocked (wchar_t, __FILE *);
+wint_t putwchar_unlocked (wchar_t);
 #endif
 
 #if __POSIX_VISIBLE >= 200809
-__FILE *_EXFUN (open_wmemstream, (wchar_t **, size_t *));
+__FILE *open_wmemstream (wchar_t **, size_t *);
 #endif
-__FILE *_EXFUN (_open_wmemstream_r, (struct _reent *, wchar_t **, size_t *));
+__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *);
 
 #ifndef __VALIST
 #ifdef __GNUC__
@@ -281,42 +281,42 @@ __FILE *_EXFUN (_open_wmemstream_r, (struct _reent *, wchar_t **, size_t *));
 #endif
 
 #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int	_EXFUN(fwprintf, (__FILE *__restrict, const wchar_t *__restrict, ...));
-int	_EXFUN(swprintf, (wchar_t *__restrict, size_t,
-			const wchar_t *__restrict, ...));
-int	_EXFUN(vfwprintf, (__FILE *__restrict, const wchar_t *__restrict,
-			__VALIST));
-int	_EXFUN(vswprintf, (wchar_t *__restrict, size_t,
-			const wchar_t *__restrict, __VALIST));
-int	_EXFUN(vwprintf, (const wchar_t *__restrict, __VALIST));
-int	_EXFUN(wprintf, (const wchar_t *__restrict, ...));
-#endif
-
-int	_EXFUN(_fwprintf_r, (struct _reent *, __FILE *, const wchar_t *, ...));
-int	_EXFUN(_swprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, ...));
-int	_EXFUN(_vfwprintf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST));
-int	_EXFUN(_vswprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, __VALIST));
-int	_EXFUN(_vwprintf_r, (struct _reent *, const wchar_t *, __VALIST));
-int	_EXFUN(_wprintf_r, (struct _reent *, const wchar_t *, ...));
+int	fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...);
+int	swprintf (wchar_t *__restrict, size_t,
+			const wchar_t *__restrict, ...);
+int	vfwprintf (__FILE *__restrict, const wchar_t *__restrict,
+			__VALIST);
+int	vswprintf (wchar_t *__restrict, size_t,
+			const wchar_t *__restrict, __VALIST);
+int	vwprintf (const wchar_t *__restrict, __VALIST);
+int	wprintf (const wchar_t *__restrict, ...);
+#endif
+
+int	_fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int	_swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...);
+int	_vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, __VALIST);
+int	_vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, __VALIST);
+int	_vwprintf_r (struct _reent *, const wchar_t *, __VALIST);
+int	_wprintf_r (struct _reent *, const wchar_t *, ...);
 
 #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int	_EXFUN(fwscanf, (__FILE *__restrict, const wchar_t *__restrict, ...));
-int	_EXFUN(swscanf, (const wchar_t *__restrict,
-			const wchar_t *__restrict, ...));
-int	_EXFUN(vfwscanf, (__FILE *__restrict, const wchar_t *__restrict,
-			__VALIST));
-int	_EXFUN(vswscanf, (const wchar_t *__restrict, const wchar_t *__restrict,
-			__VALIST));
-int	_EXFUN(vwscanf, (const wchar_t *__restrict, __VALIST));
-int	_EXFUN(wscanf, (const wchar_t *__restrict, ...));
-#endif
-
-int	_EXFUN(_fwscanf_r, (struct _reent *, __FILE *, const wchar_t *, ...));
-int	_EXFUN(_swscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, ...));
-int	_EXFUN(_vfwscanf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST));
-int	_EXFUN(_vswscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, __VALIST));
-int	_EXFUN(_vwscanf_r, (struct _reent *, const wchar_t *, __VALIST));
-int	_EXFUN(_wscanf_r, (struct _reent *, const wchar_t *, ...));
+int	fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...);
+int	swscanf (const wchar_t *__restrict,
+			const wchar_t *__restrict, ...);
+int	vfwscanf (__FILE *__restrict, const wchar_t *__restrict,
+			__VALIST);
+int	vswscanf (const wchar_t *__restrict, const wchar_t *__restrict,
+			__VALIST);
+int	vwscanf (const wchar_t *__restrict, __VALIST);
+int	wscanf (const wchar_t *__restrict, ...);
+#endif
+
+int	_fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int	_swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...);
+int	_vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, __VALIST);
+int	_vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, __VALIST);
+int	_vwscanf_r (struct _reent *, const wchar_t *, __VALIST);
+int	_wscanf_r (struct _reent *, const wchar_t *, ...);
 
 #define getwc(fp)	fgetwc(fp)
 #define putwc(wc,fp)	fputwc((wc), (fp))
diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h
index 3d36d5a92..9b710900d 100644
--- a/newlib/libc/include/wctype.h
+++ b/newlib/libc/include/wctype.h
@@ -27,26 +27,26 @@ typedef int wctype_t;
 typedef int wctrans_t;
 #endif
 
-int	_EXFUN(iswalpha, (wint_t));
-int	_EXFUN(iswalnum, (wint_t));
+int	iswalpha (wint_t);
+int	iswalnum (wint_t);
 #if __ISO_C_VISIBLE >= 1999
-int	_EXFUN(iswblank, (wint_t));
+int	iswblank (wint_t);
 #endif
-int	_EXFUN(iswcntrl, (wint_t));
-int	_EXFUN(iswctype, (wint_t, wctype_t));
-int	_EXFUN(iswdigit, (wint_t));
-int	_EXFUN(iswgraph, (wint_t));
-int	_EXFUN(iswlower, (wint_t));
-int	_EXFUN(iswprint, (wint_t));
-int	_EXFUN(iswpunct, (wint_t));
-int	_EXFUN(iswspace, (wint_t));
-int	_EXFUN(iswupper, (wint_t));
-int	_EXFUN(iswxdigit, (wint_t));
-wint_t	_EXFUN(towctrans, (wint_t, wctrans_t));
-wint_t	_EXFUN(towupper, (wint_t));
-wint_t	_EXFUN(towlower, (wint_t));
-wctrans_t _EXFUN(wctrans, (const char *));
-wctype_t _EXFUN(wctype, (const char *));
+int	iswcntrl (wint_t);
+int	iswctype (wint_t, wctype_t);
+int	iswdigit (wint_t);
+int	iswgraph (wint_t);
+int	iswlower (wint_t);
+int	iswprint (wint_t);
+int	iswpunct (wint_t);
+int	iswspace (wint_t);
+int	iswupper (wint_t);
+int	iswxdigit (wint_t);
+wint_t	towctrans (wint_t, wctrans_t);
+wint_t	towupper (wint_t);
+wint_t	towlower (wint_t);
+wctrans_t wctrans (const char *);
+wctype_t wctype (const char *);
 
 #if __POSIX_VISIBLE >= 200809
 extern int	iswalpha_l (wint_t, locale_t);
diff --git a/newlib/libc/machine/powerpc/machine/malloc.h b/newlib/libc/machine/powerpc/machine/malloc.h
index 394ad4e4e..32fbb268b 100644
--- a/newlib/libc/machine/powerpc/machine/malloc.h
+++ b/newlib/libc/machine/powerpc/machine/malloc.h
@@ -3,14 +3,14 @@
 
 # if defined(__ALTIVEC__)
 
-void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-void   _EXFUN(vec_free,(void *));
+void *vec_calloc (size_t __nmemb, size_t __size);
+void *_vec_calloc_r (struct _reent *, size_t __nmemb, size_t __size);
+void   vec_free (void *);
 #define _vec_freer _freer
-void *_EXFUN(vec_malloc,(size_t __size));
+void *vec_malloc (size_t __size);
 #define _vec_mallocr _memalign_r
-void *_EXFUN(vec_realloc,(void *__r, size_t __size));
-void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
+void *vec_realloc (void *__r, size_t __size);
+void *_vec_realloc_r (struct _reent *, void *__r, size_t __size);
 
 # endif /* __ALTIVEC__ */
 
diff --git a/newlib/libc/machine/powerpc/machine/stdlib.h b/newlib/libc/machine/powerpc/machine/stdlib.h
index ea597102b..2db801092 100644
--- a/newlib/libc/machine/powerpc/machine/stdlib.h
+++ b/newlib/libc/machine/powerpc/machine/stdlib.h
@@ -5,14 +5,14 @@
 
 # if defined(__ALTIVEC__)
 
-void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-void   _EXFUN(vec_free,(void *));
+void *vec_calloc (size_t __nmemb, size_t __size);
+void *_vec_calloc_r (struct _reent *, size_t __nmemb, size_t __size);
+void   vec_free (void *);
 #define _vec_freer _freer
-void *_EXFUN(vec_malloc,(size_t __size));
+void *vec_malloc (size_t __size);
 #define _vec_mallocr _memalign_r
-void *_EXFUN(vec_realloc,(void *__r, size_t __size));
-void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
+void *vec_realloc (void *__r, size_t __size);
+void *_vec_realloc_r (struct _reent *, void *__r, size_t __size);
 
 # endif /* __ALTIVEC__ */
 
@@ -24,39 +24,39 @@ void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
 #ifdef __cplusplus
 extern "C" {
 #endif
-__int16_t   _EXFUN(atosfix16,(const char *__str));
-__int16_t   _EXFUN(_atosfix16_r,(struct _reent *, const char *__str));
-__int32_t   _EXFUN(atosfix32,(const char *__str));
-__int32_t   _EXFUN(_atosfix32_r,(struct _reent *, const char *__str));
-__int64_t   _EXFUN(atosfix64,(const char *__str));
-__int64_t   _EXFUN(_atosfix64_r,(struct _reent *, const char *__str));
-
-__uint16_t _EXFUN(atoufix16,(const char *__str));
-__uint16_t _EXFUN(_atoufix16_r,(struct _reent *, const char *__str));
-__uint32_t _EXFUN(atoufix32,(const char *__str));
-__uint32_t _EXFUN(_atoufix32_r,(struct _reent *, const char *__str));
-__uint64_t _EXFUN(atoufix64,(const char *__str));
-__uint64_t _EXFUN(_atoufix64_r,(struct _reent *, const char *__str));
-
-__int16_t   _EXFUN(strtosfix16,(const char *__str, char **__endptr));
-__int16_t   _EXFUN(_strtosfix16_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__int32_t   _EXFUN(strtosfix32,(const char *__str, char **__endptr));
-__int32_t   _EXFUN(_strtosfix32_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__int64_t   _EXFUN(strtosfix64,(const char *__str, char **__endptr));
-__int64_t   _EXFUN(_strtosfix64_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-
-__uint16_t _EXFUN(strtoufix16,(const char *__str, char **__endptr));
-__uint16_t _EXFUN(_strtoufix16_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__uint32_t _EXFUN(strtoufix32,(const char *__str, char **__endptr));
-__uint32_t _EXFUN(_strtoufix32_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__uint64_t _EXFUN(strtoufix64,(const char *__str, char **__endptr));
-__uint64_t _EXFUN(_strtoufix64_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
+__int16_t   atosfix16 (const char *__str);
+__int16_t   _atosfix16_r (struct _reent *, const char *__str);
+__int32_t   atosfix32 (const char *__str);
+__int32_t   _atosfix32_r (struct _reent *, const char *__str);
+__int64_t   atosfix64 (const char *__str);
+__int64_t   _atosfix64_r (struct _reent *, const char *__str);
+
+__uint16_t atoufix16 (const char *__str);
+__uint16_t _atoufix16_r (struct _reent *, const char *__str);
+__uint32_t atoufix32 (const char *__str);
+__uint32_t _atoufix32_r (struct _reent *, const char *__str);
+__uint64_t atoufix64 (const char *__str);
+__uint64_t _atoufix64_r (struct _reent *, const char *__str);
+
+__int16_t   strtosfix16 (const char *__str, char **__endptr);
+__int16_t   _strtosfix16_r (struct _reent *, const char *__str, 
+                 char **__endptr);
+__int32_t   strtosfix32 (const char *__str, char **__endptr);
+__int32_t   _strtosfix32_r (struct _reent *, const char *__str, 
+                 char **__endptr);
+__int64_t   strtosfix64 (const char *__str, char **__endptr);
+__int64_t   _strtosfix64_r (struct _reent *, const char *__str, 
+                 char **__endptr);
+
+__uint16_t strtoufix16 (const char *__str, char **__endptr);
+__uint16_t _strtoufix16_r (struct _reent *, const char *__str, 
+                 char **__endptr);
+__uint32_t strtoufix32 (const char *__str, char **__endptr);
+__uint32_t _strtoufix32_r (struct _reent *, const char *__str, 
+                 char **__endptr);
+__uint64_t strtoufix64 (const char *__str, char **__endptr);
+__uint64_t _strtoufix64_r (struct _reent *, const char *__str, 
+                 char **__endptr);
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/machine/spu/c99ppe.h b/newlib/libc/machine/spu/c99ppe.h
index b0ccf2dc0..ccd2d257c 100644
--- a/newlib/libc/machine/spu/c99ppe.h
+++ b/newlib/libc/machine/spu/c99ppe.h
@@ -99,8 +99,8 @@ struct spe_reg128{
   unsigned int slot[4];
 };
 
-void _EXFUN(__sinit,(struct _reent *));
-FILE  *_EXFUN(__sfp,(struct _reent *));
+void __sinit (struct _reent *);
+FILE  *__sfp (struct _reent *);
 #define __sfp_free(fp) ( (fp)->_fp = 0 )
 
 #define CHECK_INIT(ptr) \
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index 592d714c2..31454f4c2 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -20,10 +20,10 @@
 static char *parse_number ();
 #endif
 
-static long _EXFUN(get_number, (char *, long, int));
-static void _EXFUN(print_number, (int, int, long));
-static void _EXFUN(write_char, (char c));
-static void _EXFUN(write_string, (const char *s));
+static long get_number (char *, long, int);
+static void print_number (int, int, long);
+static void write_char (char c);
+static void write_string (const char *s);
 
 /* Non-zero for big-endian systems.  */
 static int big_endian_p;
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index 34639dc09..f657f9ec9 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -59,8 +59,8 @@ _asnprintf_r (struct _reent *__restrict ptr,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_asnprintf_r"))));
+_asniprintf_r (struct _reent *, char *, size_t *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_asnprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -111,7 +111,7 @@ asnprintf (char *__restrict buf,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(asniprintf, (char *, size_t *, const char *, ...)
-       _ATTRIBUTE ((__alias__("asnprintf"))));
+asniprintf (char *, size_t *, const char *, ...)
+       _ATTRIBUTE ((__alias__("asnprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index 330491ebe..25696c575 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -51,8 +51,8 @@ _asprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
-       _ATTRIBUTE ((__alias__("_asprintf_r"))));
+_asiprintf_r (struct _reent *, char **, const char *, ...)
+       _ATTRIBUTE ((__alias__("_asprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -83,7 +83,7 @@ asprintf (char **__restrict strp,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(asiprintf, (char **, const char *, ...)
-       _ATTRIBUTE ((__alias__("asprintf"))));
+asiprintf (char **, const char *, ...)
+       _ATTRIBUTE ((__alias__("asprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 1493e1f18..ae9f86d18 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -68,8 +68,8 @@ _dprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
-       _ATTRIBUTE ((__alias__("_dprintf_r"))));
+_diprintf_r (struct _reent *, int, const char *, ...)
+       _ATTRIBUTE ((__alias__("_dprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -91,7 +91,7 @@ dprintf (int fd,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(diprintf, (int, const char *, ...)
-       _ATTRIBUTE ((__alias__("dprintf"))));
+diprintf (int, const char *, ...)
+       _ATTRIBUTE ((__alias__("dprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 4c03b1a02..efb97ad20 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -37,8 +37,8 @@ _fprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_fprintf_r"))));
+_fiprintf_r (struct _reent *, FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_fprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -58,7 +58,7 @@ fprintf (FILE *__restrict fp,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(fiprintf, (FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("fprintf"))));
+fiprintf (FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("fprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 40705a5e7..94096a22b 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -52,8 +52,8 @@ fscanf(FILE *fp, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(fiscanf, (FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("fscanf"))));
+fiscanf (FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("fscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -84,6 +84,6 @@ _fscanf_r(ptr, FILE *fp, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_fscanf_r"))));
+_fiscanf_r (struct _reent *, FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_fscanf_r")));
 #endif
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 91cabc890..139d83737 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -32,5 +32,5 @@ struct __suio {
 };
 
 
-extern int _EXFUN(__sfvwrite_r,(struct _reent *, FILE *, struct __suio *));
-extern int _EXFUN(__swsetup_r,(struct _reent *, FILE *));
+extern int __sfvwrite_r (struct _reent *, FILE *, struct __suio *);
+extern int __swsetup_r (struct _reent *, FILE *);
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index 857e980ad..1c59afd2a 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -34,7 +34,7 @@ No supporting OS subroutines are directly required.
 #include <_ansi.h>
 #include <stdio.h>
 
-extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
+extern ssize_t __getdelim (char **, size_t *, int, FILE *);
 
 ssize_t
 __getline (char **lptr,
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 68a36e054..5f56792de 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -140,59 +140,59 @@
 
 #endif /* __SINGLE_THREAD__ || __IMPL_UNLOCKED__ */
 
-extern wint_t _EXFUN(__fgetwc, (struct _reent *, FILE *));
-extern wint_t _EXFUN(__fputwc, (struct _reent *, wchar_t, FILE *));
-extern u_char *_EXFUN(__sccl, (char *, u_char *fmt));
-extern int    _EXFUN(__svfscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int    _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int    _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int    _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-int	      _EXFUN(_svfprintf_r,(struct _reent *, FILE *, const char *, 
+extern wint_t __fgetwc (struct _reent *, FILE *);
+extern wint_t __fputwc (struct _reent *, wchar_t, FILE *);
+extern u_char *__sccl (char *, u_char *fmt);
+extern int    __svfscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __ssvfscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __svfiscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __ssvfiscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __svfwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int    __ssvfwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int    __svfiwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int    __ssvfiwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+int	      _svfprintf_r (struct _reent *, FILE *, const char *, 
 				  va_list)
-               			_ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	      _EXFUN(_svfiprintf_r,(struct _reent *, FILE *, const char *, 
+               			_ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	      _svfiprintf_r (struct _reent *, FILE *, const char *, 
 				  va_list)
-               			_ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	      _EXFUN(_svfwprintf_r,(struct _reent *, FILE *, const wchar_t *, 
-				  va_list));
-int	      _EXFUN(_svfiwprintf_r,(struct _reent *, FILE *, const wchar_t *, 
-				  va_list));
-extern FILE  *_EXFUN(__sfp,(struct _reent *));
-extern int    _EXFUN(__sflags,(struct _reent *,const char*, int*));
-extern int    _EXFUN(__sflush_r,(struct _reent *,FILE *));
+               			_ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	      _svfwprintf_r (struct _reent *, FILE *, const wchar_t *, 
+				  va_list);
+int	      _svfiwprintf_r (struct _reent *, FILE *, const wchar_t *, 
+				  va_list);
+extern FILE  *__sfp (struct _reent *);
+extern int    __sflags (struct _reent *,const char*, int*);
+extern int    __sflush_r (struct _reent *,FILE *);
 #ifdef _STDIO_BSD_SEMANTICS
-extern int    _EXFUN(__sflushw_r,(struct _reent *,FILE *));
+extern int    __sflushw_r (struct _reent *,FILE *);
 #endif
-extern int    _EXFUN(__srefill_r,(struct _reent *,FILE *));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *,
-					       _READ_WRITE_BUFSIZE_TYPE));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__seofread,(struct _reent *, void *,
+extern int    __srefill_r (struct _reent *,FILE *);
+extern _READ_WRITE_RETURN_TYPE __sread (struct _reent *, void *, char *,
+					       _READ_WRITE_BUFSIZE_TYPE);
+extern _READ_WRITE_RETURN_TYPE __seofread (struct _reent *, void *,
 						  char *,
-						  _READ_WRITE_BUFSIZE_TYPE));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(struct _reent *, void *,
+						  _READ_WRITE_BUFSIZE_TYPE);
+extern _READ_WRITE_RETURN_TYPE __swrite (struct _reent *, void *,
 						const char *,
-						_READ_WRITE_BUFSIZE_TYPE));
-extern _fpos_t _EXFUN(__sseek,(struct _reent *, void *, _fpos_t, int));
-extern int    _EXFUN(__sclose,(struct _reent *, void *));
-extern int    _EXFUN(__stextmode,(int));
-extern void   _EXFUN(__sinit,(struct _reent *));
-extern void   _EXFUN(_cleanup_r,(struct _reent *));
-extern void   _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
-extern int    _EXFUN(__swhatbuf_r,(struct _reent *, FILE *, size_t *, int *));
-extern int    _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
-extern int    _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
-struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
-extern int _EXFUN(__submore, (struct _reent *, FILE *));
+						_READ_WRITE_BUFSIZE_TYPE);
+extern _fpos_t __sseek (struct _reent *, void *, _fpos_t, int);
+extern int    __sclose (struct _reent *, void *);
+extern int    __stextmode (int);
+extern void   __sinit (struct _reent *);
+extern void   _cleanup_r (struct _reent *);
+extern void   __smakebuf_r (struct _reent *, FILE *);
+extern int    __swhatbuf_r (struct _reent *, FILE *, size_t *, int *);
+extern int    _fwalk (struct _reent *, int (*)(FILE *));
+extern int    _fwalk_reent (struct _reent *, int (*)(struct _reent *, FILE *));
+struct _glue * __sfmoreglue (struct _reent *,int n);
+extern int __submore (struct _reent *, FILE *);
 
 #ifdef __LARGE64_FILES
-extern _fpos64_t _EXFUN(__sseek64,(struct _reent *, void *, _fpos64_t, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(struct _reent *, void *,
+extern _fpos64_t __sseek64 (struct _reent *, void *, _fpos64_t, int);
+extern _READ_WRITE_RETURN_TYPE __swrite64 (struct _reent *, void *,
 						  const char *,
-						  _READ_WRITE_BUFSIZE_TYPE));
+						  _READ_WRITE_BUFSIZE_TYPE);
 #endif
 
 /* Called by the main entry point fns to ensure stdio has been initialized.  */
@@ -279,12 +279,12 @@ extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(struct _reent *, void *,
 
 /* WARNING: _dcvt is defined in the stdlib directory, not here!  */
 
-char *_EXFUN(_dcvt,(struct _reent *, char *, double, int, int, char, int));
-char *_EXFUN(_sicvt,(char *, short, char));
-char *_EXFUN(_icvt,(char *, int, char));
-char *_EXFUN(_licvt,(char *, long, char));
+char *_dcvt (struct _reent *, char *, double, int, int, char, int);
+char *_sicvt (char *, short, char);
+char *_icvt (char *, int, char);
+char *_licvt (char *, long, char);
 #ifdef __GNUC__
-char *_EXFUN(_llicvt,(char *, long long, char));
+char *_llicvt (char *, long long, char);
 #endif
 
 #define CVT_BUF_SIZE 128
@@ -297,10 +297,10 @@ char *_EXFUN(_llicvt,(char *, long long, char));
 #define __sinit_lock_acquire()
 #define __sinit_lock_release()
 #else
-void _EXFUN(__sfp_lock_acquire,(void));
-void _EXFUN(__sfp_lock_release,(void));
-void _EXFUN(__sinit_lock_acquire,(void));
-void _EXFUN(__sinit_lock_release,(void));
+void __sfp_lock_acquire (void);
+void __sfp_lock_release (void);
+void __sinit_lock_acquire (void);
+void __sinit_lock_release (void);
 #endif
 
 /* Types used in positional argument support in vfprinf/vfwprintf.
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 623afb732..908fd8e32 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -433,7 +433,7 @@ __sfputs_r (struct _reent *ptr,
 }
 #endif /* STRING_ONLY.  */
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
+int _VFPRINTF_R (struct _reent *, FILE *, const char *, va_list);
 
 #ifndef STRING_ONLY
 int
@@ -447,8 +447,8 @@ VFPRINTF (FILE * fp,
 }
 
 int
-_EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vfprintf"))));
+vfiprintf (FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vfprintf")));
 #endif
 
 #ifdef STRING_ONLY
@@ -649,10 +649,10 @@ error:
 
 #ifdef STRING_ONLY
 int
-_EXFUN(_svfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_svfprintf_r"))));
+_svfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_svfprintf_r")));
 #else
 int
-_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vfprintf_r"))));
+_vfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vfprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index fe4845264..8caf3dfee 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -144,8 +144,8 @@ VFSCANF (register FILE *fp,
 }
 
 int
-_EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vfscanf"))));
+vfiscanf (FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vfscanf")));
 
 int
 __SVFSCANF (register FILE *fp,
@@ -168,8 +168,8 @@ _VFSCANF_R (struct _reent *data,
 }
 
 int
-_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vfscanf_r"))));
+_vfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vfscanf_r")));
 #endif /* !STRING_ONLY.  */
 
 #if defined (STRING_ONLY)
@@ -248,9 +248,9 @@ __ssrefill_r (struct _reent * ptr,
 }
 
 #else
-int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
-int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
+int _sungetc_r (struct _reent *, int, register FILE *);
+int __ssrefill_r (struct _reent *, register FILE *);
+size_t _sfread_r (struct _reent *, void *buf, size_t, size_t, FILE *);
 #endif /* !STRING_ONLY.  */
 
 int
@@ -448,11 +448,11 @@ all_done:
 
 #ifdef STRING_ONLY
 int
-_EXFUN(__ssvfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("__ssvfscanf_r"))));
+__ssvfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("__ssvfscanf_r")));
 #else
 int
-_EXFUN(__svfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("__svfscanf_r"))));
+__svfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("__svfscanf_r")));
 #endif
 
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index a323f5ad0..a9ba6118e 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -38,8 +38,8 @@ _printf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_printf_r"))));
+_iprintf_r (struct _reent *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_printf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -60,7 +60,7 @@ printf (const char *__restrict fmt, ...)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(iprintf, (const char *, ...)
-       _ATTRIBUTE ((__alias__("printf"))));
+iprintf (const char *, ...)
+       _ATTRIBUTE ((__alias__("printf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index 87cbeb7b8..a5a9391c0 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -53,8 +53,8 @@ scanf(fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(iscanf, (const char *, ...)
-       _ATTRIBUTE ((__alias__("scanf"))));
+iscanf (const char *, ...)
+       _ATTRIBUTE ((__alias__("scanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -85,6 +85,6 @@ _scanf_r(ptr, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_iscanf_r, (struct _reent *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_scanf_r"))));
+_iscanf_r (struct _reent *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_scanf_r")));
 #endif
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d5ba7085c..d73cdbf3a 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -73,8 +73,8 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
-       _ATTRIBUTE ((__alias__("_snprintf_r"))));
+_sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
+       _ATTRIBUTE ((__alias__("_snprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -122,7 +122,7 @@ snprintf(str, size, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(sniprintf, (char *, size_t, const char *, ...)
-       _ATTRIBUTE ((__alias__("snprintf"))));
+sniprintf (char *, size_t, const char *, ...)
+       _ATTRIBUTE ((__alias__("snprintf")));
 #endif
 #endif
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index bbb9753b9..37d92f93e 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -612,8 +612,8 @@ _sprintf_r(ptr, str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_sprintf_r"))));
+_siprintf_r (struct _reent *, char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_sprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -650,7 +650,7 @@ sprintf(str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(siprintf, (char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("sprintf"))));
+siprintf (char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("sprintf")));
 #endif
 #endif
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index a04f9b65c..971db439d 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -459,8 +459,8 @@ sscanf(str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(siscanf, (const char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("sscanf"))));
+siscanf (const char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("sscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -502,6 +502,6 @@ _sscanf_r(ptr, str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_sscanf_r"))));
+_siscanf_r (struct _reent *, const char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_sscanf_r")));
 #endif
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 5bc0ec634..1fbf5a171 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -57,9 +57,9 @@ _vasnprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
+_vasniprintf_r (struct _reent*, char *, size_t *,
 			const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vasnprintf_r"))));
+       _ATTRIBUTE ((__alias__("_vasnprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -75,7 +75,7 @@ vasnprintf (char *buf,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vasnprintf"))));
+vasniprintf (char *, size_t *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vasnprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index 4acbc0479..8fe635462 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -40,8 +40,8 @@ vasprintf (char **strp,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vasiprintf, (char **, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vasprintf"))));
+vasiprintf (char **, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vasprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -70,6 +70,6 @@ _vasprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vasprintf_r"))));
+_vasiprintf_r (struct _reent *, char **, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vasprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index 6261f6217..d22463e49 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -34,8 +34,8 @@ _vdprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vdprintf_r"))));
+_vdiprintf_r (struct _reent *, int, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vdprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -50,7 +50,7 @@ vdprintf (int fd,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vdiprintf, (int, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vdprintf"))));
+vdiprintf (int, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vdprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index c2e59fc4a..e04358967 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -517,7 +517,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
 extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
 			      int, int *, int *, char **);
 
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+extern int _ldcheck (_LONG_DOUBLE *);
 
 #  define _PRINTF_FLOAT_TYPE _LONG_DOUBLE
 #  define _DTOA_R _ldtoa_r
@@ -600,9 +600,9 @@ union arg_val
 };
 
 static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
+get_arg (struct _reent *data, int n, char *fmt,
                  va_list *ap, int *numargs, union arg_val *args,
-                 int *arg_type, char **last_fmt));
+                 int *arg_type, char **last_fmt);
 #endif /* !_NO_POS_ARGS */
 
 /*
@@ -639,7 +639,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
 # define GROUPING	0x400		/* use grouping ("'" flag) */
 #endif
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
+int _VFPRINTF_R (struct _reent *, FILE *, const char *, va_list);
 
 #ifndef STRING_ONLY
 int
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 097fd801c..b97235559 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -378,9 +378,9 @@ _sfread_r (struct _reent * ptr,
   return count;
 }
 #else /* !STRING_ONLY || !INTEGER_ONLY */
-int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
-int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
+int _sungetc_r (struct _reent *, int, register FILE *);
+int __ssrefill_r (struct _reent *, register FILE *);
+size_t _sfread_r (struct _reent *, void *buf, size_t, size_t, FILE *);
 #endif /* !STRING_ONLY || !INTEGER_ONLY */
 
 static inline int
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index dd78eb015..980b31e3b 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -149,7 +149,7 @@ SEEALSO
 # undef _NO_LONGLONG
 #endif
 
-int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
+int _VFWPRINTF_R (struct _reent *, FILE *, const wchar_t *, va_list);
 /* Defined in vfprintf.c. */
 #ifdef _FVWRITE_IN_STREAMIO
 # ifdef STRING_ONLY
@@ -157,14 +157,14 @@ int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
 # else
 #  define __SPRINT __sprint_r
 # endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, register struct __suio *));
+int __SPRINT (struct _reent *, FILE *, register struct __suio *);
 #else
 # ifdef STRING_ONLY
 #  define __SPRINT __ssputs_r
 # else
 #  define __SPRINT __sfputs_r
 # endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
+int __SPRINT (struct _reent *, FILE *, const char *, size_t);
 #endif
 #ifndef STRING_ONLY
 #ifdef _UNBUF_STREAM_OPT
@@ -239,7 +239,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
 extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
 			      int, int *, int *, char **);
 
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+extern int _ldcheck (_LONG_DOUBLE *);
 
 #  define _PRINTF_FLOAT_TYPE _LONG_DOUBLE
 #  define _DTOA_R _ldtoa_r
@@ -324,9 +324,9 @@ union arg_val
 };
 
 static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
+get_arg (struct _reent *data, int n, wchar_t *fmt,
                  va_list *ap, int *numargs, union arg_val *args,
-                 int *arg_type, wchar_t **last_fmt));
+                 int *arg_type, wchar_t **last_fmt);
 #endif /* !_NO_POS_ARGS */
 
 /*
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 79c324d55..fb46c1c1a 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -40,7 +40,7 @@ vprintf (const char *fmt,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
+viprintf (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -56,6 +56,6 @@ _vprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vprintf_r"))));
+_viprintf_r (struct _reent *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index be329ded4..bbbbd0a83 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -41,7 +41,7 @@ vscanf (const char *fmt,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
+viscanf (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -57,6 +57,6 @@ _vscanf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vscanf_r"))));
+_viscanf_r (struct _reent *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vscanf_r")));
 #endif
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index 02b5443bf..bcaffa30f 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -42,8 +42,8 @@ vsnprintf (char *__restrict str,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vsnprintf"))));
+vsniprintf (char *, size_t, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vsnprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -77,6 +77,6 @@ _vsnprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vsnprintf_r"))));
+_vsniprintf_r (struct _reent *, char *, size_t, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vsnprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 7344a3854..823cacb56 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -40,8 +40,8 @@ vsprintf (char *__restrict str,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vsiprintf, (char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vsprintf"))));
+vsiprintf (char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vsprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -66,6 +66,6 @@ _vsprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vsprintf_r"))));
+_vsiprintf_r (struct _reent *, char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vsprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 61c65cd5e..97c7bae80 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -44,8 +44,8 @@ vsscanf (const char *__restrict str,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vsiscanf, (const char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vsscanf"))));
+vsiscanf (const char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vsscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -70,6 +70,6 @@ _vsscanf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vsscanf_r"))));
+_vsiscanf_r (struct _reent *, const char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vsscanf_r")));
 #endif
diff --git a/newlib/libc/stdlib/local.h b/newlib/libc/stdlib/local.h
index 0b950d2f4..a96ed2cc4 100644
--- a/newlib/libc/stdlib/local.h
+++ b/newlib/libc/stdlib/local.h
@@ -3,7 +3,7 @@
 #ifndef _LOCAL_H_
 #define _LOCAL_H_
 
-char *	_EXFUN(_gcvt,(struct _reent *, double , int , char *, char, int));
+char *	_gcvt (struct _reent *, double , int , char *, char, int);
 
 #include "../locale/setlocale.h"
 
diff --git a/newlib/libc/stdlib/mbctype.h b/newlib/libc/stdlib/mbctype.h
index 65cf24c34..359c83c77 100644
--- a/newlib/libc/stdlib/mbctype.h
+++ b/newlib/libc/stdlib/mbctype.h
@@ -7,10 +7,10 @@
 
 /* functions used to support SHIFT_JIS, EUC-JP, and JIS multibyte encodings */
 
-int _EXFUN(_issjis1, (int c));
-int _EXFUN(_issjis2, (int c));
-int _EXFUN(_iseucjp, (int c));
-int _EXFUN(_isjis, (int c));
+int _issjis1 (int c);
+int _issjis2 (int c);
+int _iseucjp (int c);
+int _isjis (int c);
 
 #define _issjis1(c)    (((c) >= 0x81 && (c) <= 0x9f) || ((c) >= 0xe0 && (c) <= 0xef))
 #define _issjis2(c)    (((c) >= 0x40 && (c) <= 0x7e) || ((c) >= 0x80 && (c) <= 0xfc))
diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index a98120aa4..7baec835c 100644
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -385,26 +385,26 @@ typedef struct _Bigint _Bigint;
 
 struct _reent ;
 struct FPI;
-double 		_EXFUN(ulp,(double x));
-double		_EXFUN(b2d,(_Bigint *a , int *e));
-_Bigint *	_EXFUN(Balloc,(struct _reent *p, int k));
-void 		_EXFUN(Bfree,(struct _reent *p, _Bigint *v));
-_Bigint *	_EXFUN(multadd,(struct _reent *p, _Bigint *, int, int));
-_Bigint *	_EXFUN(s2b,(struct _reent *, const char*, int, int, __ULong));
-_Bigint	*	_EXFUN(i2b,(struct _reent *,int));
-_Bigint *	_EXFUN(mult, (struct _reent *, _Bigint *, _Bigint *));
-_Bigint *	_EXFUN(pow5mult, (struct _reent *, _Bigint *, int k));
-int 		_EXFUN(hi0bits,(__ULong));
-int 		_EXFUN(lo0bits,(__ULong *));
-_Bigint *	_EXFUN(d2b,(struct _reent *p, double d, int *e, int *bits));
-_Bigint *	_EXFUN(lshift,(struct _reent *p, _Bigint *b, int k));
-int		_EXFUN(match,(const char**, char*));
-_Bigint *	_EXFUN(diff,(struct _reent *p, _Bigint *a, _Bigint *b));
-int		_EXFUN(cmp,(_Bigint *a, _Bigint *b));
-int		_EXFUN(gethex,(struct _reent *p, const char **sp, const struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc));
-double		_EXFUN(ratio,(_Bigint *a, _Bigint *b));
-__ULong		_EXFUN(any_on,(_Bigint *b, int k));
-void		_EXFUN(copybits,(__ULong *c, int n, _Bigint *b));
+double 		ulp (double x);
+double		b2d (_Bigint *a , int *e);
+_Bigint *	Balloc (struct _reent *p, int k);
+void 		Bfree (struct _reent *p, _Bigint *v);
+_Bigint *	multadd (struct _reent *p, _Bigint *, int, int);
+_Bigint *	s2b (struct _reent *, const char*, int, int, __ULong);
+_Bigint	*	i2b (struct _reent *,int);
+_Bigint *	mult (struct _reent *, _Bigint *, _Bigint *);
+_Bigint *	pow5mult (struct _reent *, _Bigint *, int k);
+int 		hi0bits (__ULong);
+int 		lo0bits (__ULong *);
+_Bigint *	d2b (struct _reent *p, double d, int *e, int *bits);
+_Bigint *	lshift (struct _reent *p, _Bigint *b, int k);
+int		match (const char**, char*);
+_Bigint *	diff (struct _reent *p, _Bigint *a, _Bigint *b);
+int		cmp (_Bigint *a, _Bigint *b);
+int		gethex (struct _reent *p, const char **sp, const struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc);
+double		ratio (_Bigint *a, _Bigint *b);
+__ULong		any_on (_Bigint *b, int k);
+void		copybits (__ULong *c, int n, _Bigint *b);
 double		_strtod_l (struct _reent *ptr, const char *__restrict s00,
 			   char **__restrict se, locale_t loc);
 #if defined (_HAVE_LONG_DOUBLE) && !defined (_LDBL_EQ_DBL)
@@ -416,10 +416,10 @@ int		_strtodg_l (struct _reent *p, const char *s00, char **se,
 #endif /* _HAVE_LONG_DOUBLE && !_LDBL_EQ_DBL */
 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) || defined(_SMALL_HEXDIG)
-unsigned char _EXFUN(__hexdig_fun,(unsigned char));
+unsigned char __hexdig_fun (unsigned char);
 #endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
 #ifdef INFNAN_CHECK
-int		_EXFUN(hexnan,(const char **sp, const struct FPI *fpi, __ULong *x0));
+int		hexnan (const char **sp, const struct FPI *fpi, __ULong *x0);
 #endif
 
 #define Bcopy(x,y) memcpy((char *)&x->_sign, (char *)&y->_sign, y->_wds*sizeof(__Long) + 2*sizeof(int))
@@ -432,4 +432,4 @@ extern const unsigned char __hexdig[];
 #endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
 
 
-double _EXFUN(_mprec_log10,(int));
+double _mprec_log10 (int);
diff --git a/newlib/libc/stdlib/rand48.h b/newlib/libc/stdlib/rand48.h
index a6cb479ef..26455e35a 100644
--- a/newlib/libc/stdlib/rand48.h
+++ b/newlib/libc/stdlib/rand48.h
@@ -17,7 +17,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-extern void _EXFUN(__dorand48,(struct _reent *r, unsigned short[3]));
+extern void __dorand48 (struct _reent *r, unsigned short[3]);
 #define __rand48_seed	_REENT_RAND48_SEED(r)
 #define __rand48_mult	_REENT_RAND48_MULT(r)
 #define __rand48_add	_REENT_RAND48_ADD(r)
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index 34be6cd8f..f30b7df80 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -53,7 +53,7 @@ Supporting OS subroutines required: <<_exit>>, <<_execve>>, <<_fork_r>>,
 #include <reent.h>
 
 #if defined (unix) || defined (__CYGWIN__)
-static int _EXFUN(do_system, (struct _reent *ptr, const char *s));
+static int do_system (struct _reent *ptr, const char *s);
 #endif
 
 int
diff --git a/newlib/libc/string/local.h b/newlib/libc/string/local.h
index afef7e34a..8d364fdaa 100644
--- a/newlib/libc/string/local.h
+++ b/newlib/libc/string/local.h
@@ -2,7 +2,7 @@
 #include <../ctype/local.h>
 
 /* internal function to compute width of wide char. */
-int _EXFUN (__wcwidth, (wint_t));
+int __wcwidth (wint_t);
 
 /*
    Taken from glibc:
diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c
index 474618dd7..68f1185dd 100644
--- a/newlib/libc/sys/arm/syscalls.c
+++ b/newlib/libc/sys/arm/syscalls.c
@@ -55,7 +55,7 @@ register char * stack_ptr asm ("sp");
 
 
 /* following is copied from libc/stdio/local.h to check std streams */
-extern void   _EXFUN(__sinit,(struct _reent *));
+extern void   __sinit (struct _reent *);
 #define CHECK_INIT(ptr) \
   do						\
     {						\
diff --git a/newlib/libc/sys/linux/include/setjmp.h b/newlib/libc/sys/linux/include/setjmp.h
index f07dbab6d..f77a45708 100644
--- a/newlib/libc/sys/linux/include/setjmp.h
+++ b/newlib/libc/sys/linux/include/setjmp.h
@@ -22,10 +22,10 @@ typedef struct __sigjmpbuf
 
 typedef __jmp_buf jmp_buf;
 
-void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
-int	_EXFUN(setjmp,(jmp_buf __jmpb));
-void	_EXFUN(siglongjmp,(sigjmp_buf __jmpb, int __retval));
-int	_EXFUN(sigsetjmp,(sigjmp_buf __jmpb, int __savemask));
+void	longjmp (jmp_buf __jmpb, int __retval);
+int	setjmp (jmp_buf __jmpb);
+void	siglongjmp (sigjmp_buf __jmpb, int __retval);
+int	sigsetjmp (sigjmp_buf __jmpb, int __savemask);
 
 /* sigsetjmp is implemented as macro using setjmp */
 
diff --git a/newlib/libc/sys/linux/include/time.h b/newlib/libc/sys/linux/include/time.h
index e5456766e..5e61d2b65 100644
--- a/newlib/libc/sys/linux/include/time.h
+++ b/newlib/libc/sys/linux/include/time.h
@@ -62,27 +62,27 @@ struct tm
 typedef __timer_t timer_t;
 #endif
 
-clock_t	   _EXFUN(clock,    (void));
-double	   _EXFUN(difftime, (time_t _time2, time_t _time1));
-time_t	   _EXFUN(mktime,   (struct tm *_timeptr));
-time_t	   _EXFUN(time,     (time_t *_timer));
+clock_t	   clock (void);
+double	   difftime (time_t _time2, time_t _time1);
+time_t	   mktime (struct tm *_timeptr);
+time_t	   time (time_t *_timer);
 #ifndef _REENT_ONLY
-char	  *_EXFUN(asctime,  (const struct tm *_tblock));
-char	  *_EXFUN(ctime,    (const time_t *_time));
-struct tm *_EXFUN(gmtime,   (const time_t *_timer));
-struct tm *_EXFUN(localtime,(const time_t *_timer));
+char	  *asctime (const struct tm *_tblock);
+char	  *ctime (const time_t *_time);
+struct tm *gmtime (const time_t *_timer);
+struct tm *localtime (const time_t *_timer);
 #endif
-size_t	   _EXFUN(strftime, (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t));
+size_t	   strftime (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t);
 
-char	  *_EXFUN(asctime_r,	(const struct tm *, char *));
-char	  *_EXFUN(ctime_r,	(const time_t *, char *));
-struct tm *_EXFUN(gmtime_r,	(const time_t *, struct tm *));
-struct tm *_EXFUN(localtime_r,	(const time_t *, struct tm *));
+char	  *asctime_r 	(const struct tm *, char *);
+char	  *ctime_r 	(const time_t *, char *);
+struct tm *gmtime_r 	(const time_t *, struct tm *);
+struct tm *localtime_r 	(const time_t *, struct tm *);
 
 #ifndef __STRICT_ANSI__
-char      *_EXFUN(strptime,     (const char *, const char *, struct tm *));
-void      _EXFUN(tzset,	(void));
-void      _EXFUN(_tzset_r,	(struct _reent *));
+char      *strptime (const char *, const char *, struct tm *);
+void      tzset 	(void);
+void      _tzset_r 	(struct _reent *);
 
 typedef struct __tzrule_struct
 {
@@ -102,15 +102,15 @@ typedef struct __tzinfo_struct
   __tzrule_type __tzrule[2];
 } __tzinfo_type;
 
-__tzinfo_type *_EXFUN (__gettzinfo, (void));
+__tzinfo_type *__gettzinfo (void);
 
 /* getdate functions */
 
 #ifndef _REENT_ONLY
 #define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(void));
+int *__getdate_err (void);
 
-struct tm *	_EXFUN(getdate, (const char *));
+struct tm *	getdate (const char *);
 /* getdate_err is set to one of the following values to indicate the error.
      1  the DATEMSK environment variable is null or undefined,
      2  the template file cannot be opened for reading,
@@ -123,7 +123,7 @@ struct tm *	_EXFUN(getdate, (const char *));
 #endif /* !_REENT_ONLY */
 
 /* getdate_r returns the error code as above */
-int		_EXFUN(getdate_r, (const char *, struct tm *));
+int		getdate_r (const char *, struct tm *);
 
 /* defines for the opengroup specifications Derived from Issue 1 of the SVID.  */
 extern __IMPORT long _timezone;
@@ -145,30 +145,28 @@ extern __IMPORT char *_tzname[2];
 
 /* Clocks, P1003.1b-1993, p. 263 */
 
-int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
-int _EXFUN(clock_gettime, (clockid_t clock_id, struct timespec *tp));
-int _EXFUN(clock_getres,  (clockid_t clock_id, struct timespec *res));
+int clock_settime (clockid_t clock_id, const struct timespec *tp);
+int clock_gettime (clockid_t clock_id, struct timespec *tp);
+int clock_getres (clockid_t clock_id, struct timespec *res);
 
 /* Create a Per-Process Timer, P1003.1b-1993, p. 264 */
 
-int _EXFUN(timer_create,
-  (clockid_t clock_id, struct sigevent *evp, timer_t *timerid));
+int timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid);
 
 /* Delete a Per_process Timer, P1003.1b-1993, p. 266 */
 
-int _EXFUN(timer_delete, (timer_t timerid));
+int timer_delete (timer_t timerid);
 
 /* Per-Process Timers, P1003.1b-1993, p. 267 */
 
-int _EXFUN(timer_settime,
-  (timer_t timerid, int flags, const struct itimerspec *value,
-   struct itimerspec *ovalue));
-int _EXFUN(timer_gettime, (timer_t timerid, struct itimerspec *value));
-int _EXFUN(timer_getoverrun, (timer_t timerid));
+int timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
+   struct itimerspec *ovalue);
+int timer_gettime (timer_t timerid, struct itimerspec *value);
+int timer_getoverrun (timer_t timerid);
 
 /* High Resolution Sleep, P1003.1b-1993, p. 269 */
 
-int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
+int nanosleep (const struct timespec  *rqtp, struct timespec *rmtp);
 
 #endif /* _POSIX_TIMERS */
 
@@ -223,7 +221,7 @@ int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
 
 /* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */
 
-int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
+int clock_getcpuclockid (pid_t pid, clockid_t *clock_id);
 
 #endif /* _POSIX_CPUTIME */
 
@@ -231,8 +229,8 @@ int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
 
 /* CPU-time Clock Attribute Access, P1003.4b/D8, p. 56 */
 
-int _EXFUN(clock_setenable_attr, (clockid_t clock_id, int attr));
-int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
+int clock_setenable_attr (clockid_t clock_id, int attr);
+int clock_getenable_attr (clockid_t clock_id, int *attr);
 
 #endif /* _POSIX_CPUTIME or _POSIX_THREAD_CPUTIME */
 
diff --git a/newlib/libc/sys/linux/sys/signal.h b/newlib/libc/sys/linux/sys/signal.h
index 092798bb4..2797426d1 100644
--- a/newlib/libc/sys/linux/sys/signal.h
+++ b/newlib/libc/sys/linux/sys/signal.h
@@ -36,16 +36,16 @@ typedef _sig_func_ptr __sighandler_t;
 
 #include <_ansi.h>
 
-int 	_EXFUN(kill, (int, int));
-int 	_EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
-int 	_EXFUN(sigaddset, (sigset_t *, const int));
-int 	_EXFUN(sigdelset, (sigset_t *, const int));
-int 	_EXFUN(sigismember, (const sigset_t *, int));
-int 	_EXFUN(sigfillset, (sigset_t *));
-int 	_EXFUN(sigemptyset, (sigset_t *));
-int 	_EXFUN(sigpending, (sigset_t *));
-int 	_EXFUN(sigsuspend, (const sigset_t *));
-int 	_EXFUN(sigpause, (int));
+int 	kill (int, int);
+int 	sigaction (int, const struct sigaction *, struct sigaction *);
+int 	sigaddset (sigset_t *, const int);
+int 	sigdelset (sigset_t *, const int);
+int 	sigismember (const sigset_t *, int);
+int 	sigfillset (sigset_t *);
+int 	sigemptyset (sigset_t *);
+int 	sigpending (sigset_t *);
+int 	sigsuspend (const sigset_t *);
+int 	sigpause (int);
 
 #ifndef _POSIX_SOURCE
 extern const char *const sys_siglist[];
diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h
index c04142c45..c94bb8b94 100644
--- a/newlib/libc/sys/linux/sys/stat.h
+++ b/newlib/libc/sys/linux/sys/stat.h
@@ -17,17 +17,17 @@
 /* --- redundant stuff below --- */
 
 
-int     _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
-int     _EXFUN(mkdir,( const char *_path, mode_t __mode ));
-int     _EXFUN(mkfifo,( const char *__path, mode_t __mode ));
-int     _EXFUN(stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
-mode_t  _EXFUN(umask,( mode_t __mask ));
+int     fstat (int __fd, struct stat *__sbuf);
+int     mkdir (const char *_path, mode_t __mode);
+int     mkfifo (const char *__path, mode_t __mode);
+int     stat (const char *__restrict __path, struct stat *__restrict __sbuf);
+mode_t  umask (mode_t __mask);
 
 #ifndef _POSIX_SOURCE
-int     _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf ));
-int	_EXFUN(lstat,( const char *__restrict file_name, struct stat64 *__restrict buf));
-int	_EXFUN(lstat64,( const char *__restrict file_name, struct stat64 *__restrict buf));
-int     _EXFUN(stat64,( const char *__restrict __path, struct stat64 *__restrict __sbuf ));
+int     fstat64 (int __fd, struct stat64 *__sbuf);
+int	lstat (const char *__restrict file_name, struct stat64 *__restrict buf);
+int	lstat64 (const char *__restrict file_name, struct stat64 *__restrict buf);
+int     stat64 (const char *__restrict __path, struct stat64 *__restrict __sbuf);
 #endif /* _POSIX_SOURCE */
 
 #endif /* _SYS_STAT_H */
diff --git a/newlib/libc/sys/linux/sys/stdio.h b/newlib/libc/sys/linux/sys/stdio.h
index a99308161..e1cd22e55 100644
--- a/newlib/libc/sys/linux/sys/stdio.h
+++ b/newlib/libc/sys/linux/sys/stdio.h
@@ -16,6 +16,6 @@
 #define getline __getline
 #define getdelim __getdelim
 
-char *	_EXFUN(ctermid, (char *));
+char *	ctermid (char *);
 
 #endif /* _NEWLIB_STDIO_H */
diff --git a/newlib/libc/sys/linux/sys/string.h b/newlib/libc/sys/linux/sys/string.h
index 25489caea..dd88a8d00 100644
--- a/newlib/libc/sys/linux/sys/string.h
+++ b/newlib/libc/sys/linux/sys/string.h
@@ -2,7 +2,7 @@
 #define _SYS_STRING_H
 
 #ifndef __STRICT_ANSI__
-char    *_EXFUN(strsignal, (int __signo));
+char    *strsignal (int __signo);
 #endif
 
 #endif /* _SYS_STRING_H */
diff --git a/newlib/libc/sys/linux/sys/time.h b/newlib/libc/sys/linux/sys/time.h
index f2c656e5a..ca462fa8d 100644
--- a/newlib/libc/sys/linux/sys/time.h
+++ b/newlib/libc/sys/linux/sys/time.h
@@ -85,10 +85,10 @@
 
 #include <_ansi.h>
 
-int _EXFUN(gettimeofday, (struct timeval *__p, struct timezone *__z));
-int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
-int _EXFUN(utimes, (const char *__path, const struct timeval __tvp[2]));
-int _EXFUN(getitimer, (int __which, struct itimerval *__value));
-int _EXFUN(setitimer, (int __which, const struct itimerval *__value,
-                                        struct itimerval *__ovalue));
+int gettimeofday (struct timeval *__p, struct timezone *__z);
+int settimeofday (const struct timeval *, const struct timezone *);
+int utimes (const char *__path, const struct timeval __tvp[2]);
+int getitimer (int __which, struct itimerval *__value);
+int setitimer (int __which, const struct itimerval *__value,
+                                        struct itimerval *__ovalue);
 #endif
diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h
index 6b5a93e0c..2b3e6131f 100644
--- a/newlib/libc/sys/linux/sys/unistd.h
+++ b/newlib/libc/sys/linux/sys/unistd.h
@@ -16,86 +16,86 @@ extern "C" {
 
 extern char **environ;
 
-void	_EXFUN(_exit, (int __status ) _ATTRIBUTE ((__noreturn__)));
-
-int	_EXFUN(access,(const char *__path, int __amode ));
-unsigned  _EXFUN(alarm, (unsigned __secs ));
-int     _EXFUN(chdir, (const char *__path ));
-int     _EXFUN(chmod, (const char *__path, mode_t __mode ));
-int     _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
-int     _EXFUN(chroot, (const char *__path ));
-int     _EXFUN(close, (int __fildes ));
-char    _EXFUN(*ctermid, (char *__s ));
-char    _EXFUN(*cuserid, (char *__s ));
-int     _EXFUN(dup, (int __fildes ));
-int     _EXFUN(dup2, (int __fildes, int __fildes2 ));
-int     _EXFUN(execl, (const char *__path, const char *, ... ));
-int     _EXFUN(execle, (const char *__path, const char *, ... ));
-int     _EXFUN(execlp, (const char *__file, const char *, ... ));
-int     _EXFUN(execv, (const char *__path, char * const __argv[] ));
-int     _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-int     _EXFUN(execvp, (const char *__file, char * const __argv[] ));
-int     _EXFUN(fchdir, (int __fildes));
-int     _EXFUN(fchmod, (int __fildes, mode_t __mode ));
-int     _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
-pid_t   _EXFUN(fork, (void ));
-long    _EXFUN(fpathconf, (int __fd, int __name ));
-int     _EXFUN(fsync, (int __fd));
-int     _EXFUN(ftruncate, (int __fd, off_t __length));
-char    _EXFUN(*getcwd, (char *__buf, size_t __size ));
-int	_EXFUN(getdomainname ,(char *__name, size_t __len));
-gid_t   _EXFUN(getegid, (void ));
-uid_t   _EXFUN(geteuid, (void ));
-gid_t   _EXFUN(getgid, (void ));
-int     _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
-int 	_EXFUN(__gethostname, (char *__name, size_t __len));
-char    _EXFUN(*getlogin, (void ));
+void	_exit (int __status) _ATTRIBUTE ((__noreturn__));
+
+int	access (const char *__path, int __amode);
+unsigned  alarm (unsigned __secs);
+int     chdir (const char *__path);
+int     chmod (const char *__path, mode_t __mode);
+int     chown (const char *__path, uid_t __owner, gid_t __group);
+int     chroot (const char *__path);
+int     close (int __fildes);
+char    *ctermid (char *__s);
+char    *cuserid (char *__s);
+int     dup (int __fildes);
+int     dup2 (int __fildes, int __fildes2);
+int     execl (const char *__path, const char *, ...);
+int     execle (const char *__path, const char *, ...);
+int     execlp (const char *__file, const char *, ...);
+int     execv (const char *__path, char * const __argv[]);
+int     execve (const char *__path, char * const __argv[], char * const __envp[]);
+int     execvp (const char *__file, char * const __argv[]);
+int     fchdir (int __fildes);
+int     fchmod (int __fildes, mode_t __mode);
+int     fchown (int __fildes, uid_t __owner, gid_t __group);
+pid_t   fork (void);
+long    fpathconf (int __fd, int __name);
+int     fsync (int __fd);
+int     ftruncate (int __fd, off_t __length);
+char    *getcwd (char *__buf, size_t __size);
+int	getdomainname  (char *__name, size_t __len);
+gid_t   getegid (void);
+uid_t   geteuid (void);
+gid_t   getgid (void);
+int     getgroups (int __gidsetsize, gid_t __grouplist[]);
+int 	__gethostname (char *__name, size_t __len);
+char    *getlogin (void);
 #if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-int _EXFUN(getlogin_r, (char *name, size_t namesize) );
+int getlogin_r (char *name, size_t namesize) ;
 #endif
-char 	_EXFUN(*getpass, (__const char *__prompt));
-int  _EXFUN(getpagesize, (void));
-pid_t   _EXFUN(getpgid, (pid_t));
-pid_t   _EXFUN(getpgrp, (void ));
-pid_t   _EXFUN(getpid, (void ));
-pid_t   _EXFUN(getppid, (void ));
-uid_t   _EXFUN(getuid, (void ));
-char *	_EXFUN(getusershell, (void));
-char    _EXFUN(*getwd, (char *__buf ));
-int     _EXFUN(isatty, (int __fildes ));
-int     _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
-int     _EXFUN(link, (const char *__path1, const char *__path2 ));
-int	_EXFUN(nice, (int __nice_value ));
-off_t   _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
-long    _EXFUN(pathconf, (const char *__path, int __name ));
-int     _EXFUN(pause, (void ));
-int     _EXFUN(pipe, (int __fildes[2] ));
-ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
-ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
-_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
-int     _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
-int     _EXFUN(rmdir, (const char *__path ));
-void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
-int     _EXFUN(setegid, (gid_t __gid ));
-int     _EXFUN(seteuid, (uid_t __uid ));
-int     _EXFUN(setgid, (gid_t __gid ));
-int     _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
-int     _EXFUN(setpgrp, (void ));
-pid_t   _EXFUN(setsid, (void ));
-int     _EXFUN(setuid, (uid_t __uid ));
-unsigned _EXFUN(sleep, (unsigned int __seconds ));
-void    _EXFUN(swab, (const void *, void *, ssize_t));
-int     _EXFUN(symlink, (const char *oldpath, const char *newpath));
-long    _EXFUN(sysconf, (int __name ));
-pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
-int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
-int     _EXFUN(truncate, (const char *, off_t __length));
-char *  _EXFUN(ttyname, (int __fildes ));
-int     _EXFUN(ttyname_r, (int __fildes, char *__buf, size_t __len));
-int     _EXFUN(unlink, (const char *__path ));
-int     _EXFUN(usleep, (__useconds_t __useconds));
-int     _EXFUN(vhangup, (void ));
-_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
+char 	*getpass (__const char *__prompt);
+int  getpagesize (void);
+pid_t   getpgid (pid_t);
+pid_t   getpgrp (void);
+pid_t   getpid (void);
+pid_t   getppid (void);
+uid_t   getuid (void);
+char *	getusershell (void);
+char    *getwd (char *__buf);
+int     isatty (int __fildes);
+int     lchown (const char *__path, uid_t __owner, gid_t __group);
+int     link (const char *__path1, const char *__path2);
+int	nice (int __nice_value);
+off_t   lseek (int __fildes, off_t __offset, int __whence);
+long    pathconf (const char *__path, int __name);
+int     pause (void);
+int     pipe (int __fildes[2]);
+ssize_t pread (int __fd, void *__buf, size_t __nbytes, off_t __offset);
+ssize_t pwrite (int __fd, const void *__buf, size_t __nbytes, off_t __offset);
+_READ_WRITE_RETURN_TYPE read (int __fd, void *__buf, size_t __nbyte);
+int     readlink (const char *path, char *buf, size_t bufsiz);
+int     rmdir (const char *__path);
+void *  sbrk (ptrdiff_t __incr);
+int     setegid (gid_t __gid);
+int     seteuid (uid_t __uid);
+int     setgid (gid_t __gid);
+int     setpgid (pid_t __pid, pid_t __pgid);
+int     setpgrp (void);
+pid_t   setsid (void);
+int     setuid (uid_t __uid);
+unsigned sleep (unsigned int __seconds);
+void    swab (const void *, void *, ssize_t);
+int     symlink (const char *oldpath, const char *newpath);
+long    sysconf (int __name);
+pid_t   tcgetpgrp (int __fildes);
+int     tcsetpgrp (int __fildes, pid_t __pgrp_id);
+int     truncate (const char *, off_t __length);
+char *  ttyname (int __fildes);
+int     ttyname_r (int __fildes, char *__buf, size_t __len);
+int     unlink (const char *__path);
+int     usleep (__useconds_t __useconds);
+int     vhangup (void);
+_READ_WRITE_RETURN_TYPE write (int __fd, const void *__buf, size_t __nbyte);
 
 extern char *optarg;			/* getopt(3) external variables */
 extern int optind, opterr, optopt;
@@ -103,7 +103,7 @@ int	 getopt(int, char * const [], const char *);
 extern int optreset;			/* getopt(3) external variable */
 
 #ifndef        _POSIX_SOURCE
-pid_t   _EXFUN(vfork, (void ));
+pid_t   vfork (void);
 
 extern char *suboptarg;			/* getsubopt(3) external variable */
 int	 getsubopt(char **, char * const *, char **);
@@ -111,16 +111,16 @@ int	 getsubopt(char **, char * const *, char **);
 
 /* Provide prototypes for most of the _<systemcall> names that are
    provided in newlib for some compilers.  */
-int     _EXFUN(_close, (int __fildes ));
-pid_t   _EXFUN(_fork, (void ));
-pid_t   _EXFUN(_getpid, (void ));
-int     _EXFUN(_link, (const char *__path1, const char *__path2 ));
-off_t   _EXFUN(_lseek, (int __fildes, off_t __offset, int __whence ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
-void *  _EXFUN(_sbrk,  (size_t __incr));
-int     _EXFUN(_unlink, (const char *__path ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
-int     _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
+int     _close (int __fildes);
+pid_t   _fork (void);
+pid_t   _getpid (void);
+int     _link (const char *__path1, const char *__path2);
+off_t   _lseek (int __fildes, off_t __offset, int __whence);
+_READ_WRITE_RETURN_TYPE _read (int __fd, void *__buf, size_t __nbyte);
+void *  _sbrk (size_t __incr);
+int     _unlink (const char *__path);
+_READ_WRITE_RETURN_TYPE _write (int __fd, const void *__buf, size_t __nbyte);
+int     _execve (const char *__path, char * const __argv[], char * const __envp[]);
 
 #define	F_OK	0
 #define	R_OK	4
diff --git a/newlib/libc/sys/linux/sys/utime.h b/newlib/libc/sys/linux/sys/utime.h
index 7499cfe7e..0df444ae6 100644
--- a/newlib/libc/sys/linux/sys/utime.h
+++ b/newlib/libc/sys/linux/sys/utime.h
@@ -9,6 +9,6 @@ struct utimbuf
     time_t modtime;		/* Modification time.  */
   };
 
-int _EXFUN(utime, (const char *__file, const struct utimbuf *__times));
+int utime (const char *__file, const struct utimbuf *__times);
 
 #endif /* _SYS_UTIME_H */
diff --git a/newlib/libc/sys/sparc64/sys/stat.h b/newlib/libc/sys/sparc64/sys/stat.h
index 746406737..c1f2a61d4 100644
--- a/newlib/libc/sys/sparc64/sys/stat.h
+++ b/newlib/libc/sys/sparc64/sys/stat.h
@@ -119,12 +119,12 @@ struct	stat
 #define	S_ISLNK(m)	(((m)&_IFMT) == _IFLNK)
 #define	S_ISSOCK(m)	(((m)&_IFMT) == _IFSOCK)
 
-int	_EXFUN(chmod,( const char *_path, mode_t _mode ));
-int	_EXFUN(fstat,( int _fd, struct stat *_sbuf ));
-int	_EXFUN(mkdir,( char *_path, mode_t _mode ));
-int	_EXFUN(mkfifo,( char *_path, mode_t _mode ));
-int	_EXFUN(stat,( const char *__restrict _path, struct stat *__restrict _sbuf ));
-mode_t	_EXFUN(umask,( mode_t _mask ));
+int	chmod (const char *_path, mode_t _mode);
+int	fstat (int _fd, struct stat *_sbuf);
+int	mkdir (char *_path, mode_t _mode);
+int	mkfifo (char *_path, mode_t _mode);
+int	stat (const char *__restrict _path, struct stat *__restrict _sbuf);
+mode_t	umask (mode_t _mask);
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
index 10c5b445d..dce51cda2 100644
--- a/newlib/libc/time/local.h
+++ b/newlib/libc/time/local.h
@@ -19,12 +19,12 @@
 
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 
-int         _EXFUN (__tzcalc_limits, (int __year));
+int         __tzcalc_limits (int __year);
 
 extern const int __month_lengths[2][MONSPERYEAR];
 
-void _EXFUN(_tzset_unlocked_r, (struct _reent *));
-void _EXFUN(_tzset_unlocked, (void));
+void _tzset_unlocked_r (struct _reent *);
+void _tzset_unlocked (void);
 
 /* locks for multi-threading */
 #ifdef __SINGLE_THREAD__
@@ -35,6 +35,6 @@ void _EXFUN(_tzset_unlocked, (void));
 #define TZ_UNLOCK __tz_unlock()
 #endif
 
-void _EXFUN(__tz_lock,(void));
-void _EXFUN(__tz_unlock,(void));
+void __tz_lock (void);
+void __tz_unlock (void);
 
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 3187ade74..a3d97b633 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -53,22 +53,22 @@
 # define htonl(x) xdr_htonl(x)
 #endif
 
-static void _EXFUN (xdrmem_destroy, (XDR *));
-static bool_t _EXFUN (xdrmem_getlong_aligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, const long *));
-static bool_t _EXFUN (xdrmem_getlong_unaligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, const long *));
-static bool_t _EXFUN (xdrmem_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrmem_putbytes, (XDR *, const char *, u_int));
+static void xdrmem_destroy (XDR *);
+static bool_t xdrmem_getlong_aligned (XDR *, long *);
+static bool_t xdrmem_putlong_aligned (XDR *, const long *);
+static bool_t xdrmem_getlong_unaligned (XDR *, long *);
+static bool_t xdrmem_putlong_unaligned (XDR *, const long *);
+static bool_t xdrmem_getbytes (XDR *, char *, u_int);
+static bool_t xdrmem_putbytes (XDR *, const char *, u_int);
 /* XXX: w/64-bit pointers, u_int not enough! */
-static u_int _EXFUN (xdrmem_getpos, (XDR *));
-static bool_t _EXFUN (xdrmem_setpos, (XDR *, u_int));
-static int32_t * _EXFUN (xdrmem_inline_aligned, (XDR *, u_int));
-static int32_t * _EXFUN (xdrmem_inline_unaligned, (XDR *, u_int));
-static bool_t  _EXFUN (xdrmem_getint32_aligned, (XDR *, int32_t *));
-static bool_t  _EXFUN (xdrmem_putint32_aligned, (XDR *, const int32_t *));
-static bool_t  _EXFUN (xdrmem_getint32_unaligned, (XDR *, int32_t *));
-static bool_t  _EXFUN (xdrmem_putint32_unaligned, (XDR *, const int32_t *));
+static u_int xdrmem_getpos (XDR *);
+static bool_t xdrmem_setpos (XDR *, u_int);
+static int32_t * xdrmem_inline_aligned (XDR *, u_int);
+static int32_t * xdrmem_inline_unaligned (XDR *, u_int);
+static bool_t  xdrmem_getint32_aligned (XDR *, int32_t *);
+static bool_t  xdrmem_putint32_aligned (XDR *, const int32_t *);
+static bool_t  xdrmem_getint32_unaligned (XDR *, int32_t *);
+static bool_t  xdrmem_putint32_unaligned (XDR *, const int32_t *);
 
 static const struct xdr_ops xdrmem_ops_aligned = {
   xdrmem_getlong_aligned,
diff --git a/newlib/libc/xdr/xdr_private.h b/newlib/libc/xdr/xdr_private.h
index 3b071d668..98c9daada 100644
--- a/newlib/libc/xdr/xdr_private.h
+++ b/newlib/libc/xdr/xdr_private.h
@@ -43,13 +43,13 @@ extern "C" {
 
 typedef void (*xdr_vprintf_t) (const char *, va_list);
 
-xdr_vprintf_t _EXFUN (xdr_set_vprintf, (xdr_vprintf_t));
+xdr_vprintf_t xdr_set_vprintf (xdr_vprintf_t);
 
-void _EXFUN (xdr_vwarnx, (const char *, __VALIST)
-              _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
+void xdr_vwarnx (const char *, __VALIST)
+              _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
 
-void _EXFUN (xdr_warnx, (const char *, ...)
-              _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
+void xdr_warnx (const char *, ...)
+              _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
 
 /* endian issues */
 #include <machine/endian.h>
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 9051d522f..24cb5eb53 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -72,16 +72,16 @@ enum xprt_stat
   XPRT_IDLE
 };
 
-static bool_t _EXFUN (xdrrec_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrrec_putlong, (XDR *, const long *));
-static bool_t _EXFUN (xdrrec_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrrec_putbytes, (XDR *, const char *, u_int));
-static u_int _EXFUN (xdrrec_getpos, (XDR *));
-static bool_t _EXFUN (xdrrec_setpos, (XDR *, u_int));
-static int32_t * _EXFUN (xdrrec_inline, (XDR *, u_int));
-static void _EXFUN (xdrrec_destroy, (XDR *));
-static bool_t _EXFUN (xdrrec_getint32, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrrec_putint32, (XDR *, const int32_t *));
+static bool_t xdrrec_getlong (XDR *, long *);
+static bool_t xdrrec_putlong (XDR *, const long *);
+static bool_t xdrrec_getbytes (XDR *, char *, u_int);
+static bool_t xdrrec_putbytes (XDR *, const char *, u_int);
+static u_int xdrrec_getpos (XDR *);
+static bool_t xdrrec_setpos (XDR *, u_int);
+static int32_t * xdrrec_inline (XDR *, u_int);
+static void xdrrec_destroy (XDR *);
+static bool_t xdrrec_getint32 (XDR *, int32_t *);
+static bool_t xdrrec_putint32 (XDR *, const int32_t *);
 
 static const struct xdr_ops xdrrec_ops = {
   xdrrec_getlong,
@@ -156,8 +156,8 @@ static bool_t set_input_fragment (RECSTREAM *);
 static bool_t skip_input_bytes (RECSTREAM *, long);
 static bool_t realloc_stream (RECSTREAM *, int);
 
-bool_t _EXFUN (__xdrrec_getrec, (XDR *, enum xprt_stat *, bool_t));
-bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
+bool_t __xdrrec_getrec (XDR *, enum xprt_stat *, bool_t);
+bool_t __xdrrec_setnonblock (XDR *, int);
 
 /*
  * Create an xdr handle for xdrrec
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index 784ac6c8b..05fbe1f30 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -50,16 +50,16 @@
 # define htonl(x) xdr_htonl(x)
 #endif
 
-static void _EXFUN (xdrstdio_destroy, (XDR *));
-static bool_t _EXFUN (xdrstdio_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrstdio_putlong, (XDR *, const long *));
-static bool_t _EXFUN (xdrstdio_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, const char *, u_int));
-static u_int _EXFUN (xdrstdio_getpos, (XDR *));
-static bool_t _EXFUN (xdrstdio_setpos, (XDR *, u_int));
-static int32_t * _EXFUN (xdrstdio_inline, (XDR *, u_int));
-static bool_t _EXFUN (xdrstdio_getint32, (XDR*, int32_t *));
-static bool_t _EXFUN (xdrstdio_putint32, (XDR*, const int32_t *));
+static void xdrstdio_destroy (XDR *);
+static bool_t xdrstdio_getlong (XDR *, long *);
+static bool_t xdrstdio_putlong (XDR *, const long *);
+static bool_t xdrstdio_getbytes (XDR *, char *, u_int);
+static bool_t xdrstdio_putbytes (XDR *, const char *, u_int);
+static u_int xdrstdio_getpos (XDR *);
+static bool_t xdrstdio_setpos (XDR *, u_int);
+static int32_t * xdrstdio_inline (XDR *, u_int);
+static bool_t xdrstdio_getint32 (XDR*, int32_t *);
+static bool_t xdrstdio_putint32 (XDR*, const int32_t *);
 
 /*
  * Ops vector for stdio type XDR
diff --git a/newlib/libm/mathfp/zmath.h b/newlib/libm/mathfp/zmath.h
index 369bfec49..67bdb24a7 100644
--- a/newlib/libm/mathfp/zmath.h
+++ b/newlib/libm/mathfp/zmath.h
@@ -39,17 +39,17 @@ extern float   z_rooteps_f;
 
 /* Core math routines. */
 
-int    _EXFUN (numtest, (double));
-int    _EXFUN (numtestf, (float));
-double _EXFUN (logarithm, (double, int));
-float  _EXFUN (logarithmf, (float, int));
-double _EXFUN (sine, (double, int));
-float  _EXFUN (sinef, (float, int));
-double _EXFUN (asine, (double, int));
-float  _EXFUN (asinef, (float, int));
-double _EXFUN (atangent, (double, double, double, int));
-float  _EXFUN (atangentf, (float, float, float, int));
-double _EXFUN (sineh, (double, int));
-float  _EXFUN (sinehf, (float, int));
+int    numtest (double);
+int    numtestf (float);
+double logarithm (double, int);
+float  logarithmf (float, int);
+double sine (double, int);
+float  sinef (float, int);
+double asine (double, int);
+float  asinef (float, int);
+double atangent (double, double, double, int);
+float  atangentf (float, float, float, int);
+double sineh (double, int);
+float  sinehf (float, int);
 
 #endif /* no __ZMATH_H */
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index fe5bc0aa4..026bd277b 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -49,7 +49,7 @@ test_atoff (void)
 
 static
 void 
-iterate (void _EXFUN((*func),(void)),
+iterate (void (*func) (void),
        char *name)
 {
 
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index dda587a33..0a6389a01 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -263,7 +263,7 @@ run_vector_1 (int vector,
 
     if (strcmp(args,"dd")==0)
     {
-      typedef double _EXFUN((*pdblfunc),(double));
+      typedef double (*pdblfunc) (double);
       
       /* Double function returning a double */
       
@@ -276,7 +276,7 @@ run_vector_1 (int vector,
       float arga;
       double a;
       
-      typedef float _EXFUN((*pdblfunc),(float));
+      typedef float (*pdblfunc) (float);
       
       /* Double function returning a double */
       
@@ -289,7 +289,7 @@ run_vector_1 (int vector,
     }      
     else if (strcmp(args,"ddd")==0)
      {
-       typedef double _EXFUN((*pdblfunc),(double,double));
+       typedef double (*pdblfunc) (double,double);
       
        result = ((pdblfunc)(func))(arg1,arg2);
        finish(f, vector, result, p,args, name);       
@@ -301,7 +301,7 @@ run_vector_1 (int vector,
        float arga;
        float argb;
       
-       typedef float _EXFUN((*pdblfunc),(float,float));
+       typedef float (*pdblfunc) (float,float);
       
 
        if (arg1 < FLT_MAX && arg2 < FLT_MAX) 
@@ -314,7 +314,7 @@ run_vector_1 (int vector,
      }      
      else if (strcmp(args,"did")==0)
      {
-       typedef double _EXFUN((*pdblfunc),(int,double));
+       typedef double (*pdblfunc) (int,double);
       
        result = ((pdblfunc)(func))((int)arg1,arg2);
        finish(f, vector, result, p,args, name);       
@@ -326,7 +326,7 @@ run_vector_1 (int vector,
        float arga;
        float argb;
       
-       typedef float _EXFUN((*pdblfunc),(int,float));
+       typedef float (*pdblfunc) (int,float);
       
 
        if (arg1 < FLT_MAX && arg2 < FLT_MAX) 
diff --git a/newlib/libm/test/test.h b/newlib/libm/test/test.h
index 440c3850e..e95c6b4c4 100644
--- a/newlib/libm/test/test.h
+++ b/newlib/libm/test/test.h
@@ -34,7 +34,7 @@ typedef struct
 #define MVEC_END    0,};
 
 
-int _EXFUN(mag_of_error,(double, double));
+int mag_of_error (double, double);
 
 
 #define ERROR_PERFECT 20
@@ -128,18 +128,18 @@ typedef struct
 } sprint_int_type;
 
 
-void _EXFUN(test_ieee,(void));
-void _EXFUN(test_math2,(void));
-void _EXFUN(test_math,(void));
-void _EXFUN(test_string,(void));
-void _EXFUN(test_is,(void));
-void _EXFUN(test_cvt,(void));
+void test_ieee (void);
+void test_math2 (void);
+void test_math (void);
+void test_string (void);
+void test_is (void);
+void test_cvt (void);
 
-void _EXFUN(line,(int));
+void line (int);
 
-void _EXFUN(test_mok, (double, double, int));
-void _EXFUN(test_iok, (int, int));
-void _EXFUN(test_eok, (int, int));
-void _EXFUN(test_sok, (char *, char*));
-void _EXFUN(test_scok, (char *, char*, int));
-void _EXFUN(newfunc,(const char *));
+void test_mok (double, double, int);
+void test_iok (int, int);
+void test_eok (int, int);
+void test_sok (char *, char*);
+void test_scok (char *, char*, int);
+void newfunc (const char *);
diff --git a/winsup/cygwin/include/attr/xattr.h b/winsup/cygwin/include/attr/xattr.h
index 7e410414d..07d33837e 100644
--- a/winsup/cygwin/include/attr/xattr.h
+++ b/winsup/cygwin/include/attr/xattr.h
@@ -26,18 +26,18 @@ details. */
 
 _BEGIN_STD_C
 
-ssize_t _EXFUN(getxattr,(const char *, const char *, void *, size_t ));
-ssize_t _EXFUN(lgetxattr,(const char *, const char *, void *, size_t ));
-ssize_t _EXFUN(fgetxattr,(int , const char *, void *, size_t ));
-ssize_t _EXFUN(listxattr,(const char *, char *, size_t ));
-ssize_t _EXFUN(llistxattr,(const char *, char *, size_t ));
-ssize_t _EXFUN(flistxattr,(int , char *, size_t ));
-int _EXFUN(setxattr,(const char *, const char *, const void *, size_t , int ));
-int _EXFUN(lsetxattr,(const char *, const char *, const void *, size_t , int ));
-int _EXFUN(fsetxattr,(int , const char *, const void *, size_t , int ));
-int _EXFUN(removexattr,(const char *, const char *));
-int _EXFUN(lremovexattr,(const char *, const char *));
-int _EXFUN(fremovexattr,(int ,   const char *));
+ssize_t getxattr (const char *, const char *, void *, size_t);
+ssize_t lgetxattr (const char *, const char *, void *, size_t);
+ssize_t fgetxattr (int , const char *, void *, size_t);
+ssize_t listxattr (const char *, char *, size_t);
+ssize_t llistxattr (const char *, char *, size_t);
+ssize_t flistxattr (int , char *, size_t);
+int setxattr (const char *, const char *, const void *, size_t , int);
+int lsetxattr (const char *, const char *, const void *, size_t , int);
+int fsetxattr (int , const char *, const void *, size_t , int);
+int removexattr (const char *, const char *);
+int lremovexattr (const char *, const char *);
+int fremovexattr (int ,   const char *);
 
 _END_STD_C
 
diff --git a/winsup/cygwin/include/pty.h b/winsup/cygwin/include/pty.h
index 7b92a2b4d..8754dedc9 100644
--- a/winsup/cygwin/include/pty.h
+++ b/winsup/cygwin/include/pty.h
@@ -8,10 +8,10 @@
 extern "C" {
 #endif
 
-int _EXFUN(openpty ,(int *, int *, char *, const struct termios *,
-		     const struct winsize *));
-int _EXFUN(forkpty ,(int *, char *, const struct termios *,
-		     const struct winsize *));
+int openpty (int *, int *, char *, const struct termios *,
+		     const struct winsize *);
+int forkpty (int *, char *, const struct termios *,
+		     const struct winsize *);
 
 #ifdef __cplusplus
 }
diff --git a/winsup/cygwin/include/sys/stdio.h b/winsup/cygwin/include/sys/stdio.h
index ac22a3940..1e6830fb0 100644
--- a/winsup/cygwin/include/sys/stdio.h
+++ b/winsup/cygwin/include/sys/stdio.h
@@ -32,8 +32,8 @@ details. */
 
 __BEGIN_DECLS
 
-ssize_t	_EXFUN(getline, (char **, size_t *, FILE *));
-ssize_t	_EXFUN(getdelim, (char **, size_t *, int, FILE *));
+ssize_t	getline (char **, size_t *, FILE *);
+ssize_t	getdelim (char **, size_t *, int, FILE *);
 
 __END_DECLS
 
diff --git a/winsup/cygwin/include/sys/utime.h b/winsup/cygwin/include/sys/utime.h
index 8408fa1df..ab6faebb9 100644
--- a/winsup/cygwin/include/sys/utime.h
+++ b/winsup/cygwin/include/sys/utime.h
@@ -19,7 +19,7 @@ struct utimbuf
   time_t modtime;
 };
 
-int _EXFUN(utime, (const char *__path, const struct utimbuf *__buf));
+int utime (const char *__path, const struct utimbuf *__buf);
 
 #ifdef __cplusplus
 };
