diff --git a/libgloss/bfin/_exit.c b/libgloss/bfin/_exit.c
index e8186326a..e55cf0849 100644
--- a/libgloss/bfin/_exit.c
+++ b/libgloss/bfin/_exit.c
@@ -17,8 +17,7 @@
 #include <_ansi.h>
 
 void
-_DEFUN (_exit, (rc),
-	int rc)
+_exit (int rc)
 {
   while (1)
     asm volatile ("EXCPT 0;");
diff --git a/libgloss/close.c b/libgloss/close.c
index 7aafcea46..48156aa35 100644
--- a/libgloss/close.c
+++ b/libgloss/close.c
@@ -18,8 +18,7 @@
  * close -- We don't need to do anything, but pretend we did.
  */
 int
-_DEFUN (close ,(fd),
-       int fd)
+close  (int fd)
 {
   return (0);
 }
diff --git a/libgloss/cr16/fstat.c b/libgloss/cr16/fstat.c
index 73e1fa248..781b2a208 100644
--- a/libgloss/cr16/fstat.c
+++ b/libgloss/cr16/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_fstat, (fd, buf),
-       int fd,
+_fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/cr16/getpid.c b/libgloss/cr16/getpid.c
index d254c9b0d..efe190098 100644
--- a/libgloss/cr16/getpid.c
+++ b/libgloss/cr16/getpid.c
@@ -19,8 +19,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (_getpid, (),
-        )
+_getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/cr16/isatty.c b/libgloss/cr16/isatty.c
index 604e8f097..fa3cd038c 100644
--- a/libgloss/cr16/isatty.c
+++ b/libgloss/cr16/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes and return a 1.
  */
 int
-_DEFUN (_isatty, (fd),
-       int fd)
+_isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/cr16/kill.c b/libgloss/cr16/kill.c
index 43c3ec554..f51ddb5f5 100644
--- a/libgloss/cr16/kill.c
+++ b/libgloss/cr16/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  * kill -- go out via exit...
  */
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/cr16/putnum.c b/libgloss/cr16/putnum.c
index 3317bbf0a..af7232205 100644
--- a/libgloss/cr16/putnum.c
+++ b/libgloss/cr16/putnum.c
@@ -18,8 +18,7 @@
  * putnum -- print a 32 bit number in hex
  */
 void
-_DEFUN (putnum, (num),
-	unsigned int num)
+putnum (unsigned int num)
 {
   char  buf[9];
   int   cnt;
diff --git a/libgloss/cr16/stat.c b/libgloss/cr16/stat.c
index 743fc94a9..3900a1bce 100644
--- a/libgloss/cr16/stat.c
+++ b/libgloss/cr16/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_stat, (path, buf),
-       const char *path,
+_stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c
index 75f863583..e96cc07d1 100644
--- a/libgloss/crx/fstat.c
+++ b/libgloss/crx/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (fstat, (fd, buf),
-       int fd,
+fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/crx/getpid.c b/libgloss/crx/getpid.c
index 3c1a7b8b8..912ca18a5 100644
--- a/libgloss/crx/getpid.c
+++ b/libgloss/crx/getpid.c
@@ -19,8 +19,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (getpid, (),
-        )
+getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c
index ac3d041e7..c0039a59e 100644
--- a/libgloss/crx/isatty.c
+++ b/libgloss/crx/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes and return a 1.
  */
 int
-_DEFUN (isatty, (fd),
-       int fd)
+isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c
index db5018cfc..98cd3c40e 100644
--- a/libgloss/crx/kill.c
+++ b/libgloss/crx/kill.c
@@ -19,8 +19,7 @@
  * kill -- go out via exit...
  */
 int
-_DEFUN (kill, (pid, sig),
-        int pid,
+kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/crx/putnum.c b/libgloss/crx/putnum.c
index 3317bbf0a..af7232205 100644
--- a/libgloss/crx/putnum.c
+++ b/libgloss/crx/putnum.c
@@ -18,8 +18,7 @@
  * putnum -- print a 32 bit number in hex
  */
 void
-_DEFUN (putnum, (num),
-	unsigned int num)
+putnum (unsigned int num)
 {
   char  buf[9];
   int   cnt;
diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c
index 9562b9097..497ef83c0 100644
--- a/libgloss/crx/stat.c
+++ b/libgloss/crx/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (stat, (path, buf),
-       const char *path,
+stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/epiphany/_isatty.c b/libgloss/epiphany/_isatty.c
index 9ec5060f9..cfb1bf6e4 100644
--- a/libgloss/epiphany/_isatty.c
+++ b/libgloss/epiphany/_isatty.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 
 int
-_DEFUN(_isatty, (fd), int fd)
+_isatty (int fd)
 {
   struct stat buf;
 
diff --git a/libgloss/frv/fstat.c b/libgloss/frv/fstat.c
index 680c4a1c0..99f0abfd6 100644
--- a/libgloss/frv/fstat.c
+++ b/libgloss/frv/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_fstat, (fd, buf),
-       int fd,
+_fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/frv/getpid.c b/libgloss/frv/getpid.c
index e6d568207..1809a2dde 100644
--- a/libgloss/frv/getpid.c
+++ b/libgloss/frv/getpid.c
@@ -18,8 +18,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (_getpid, (),
-        )
+_getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/frv/isatty.c b/libgloss/frv/isatty.c
index e4c99065b..65c02b7d6 100644
--- a/libgloss/frv/isatty.c
+++ b/libgloss/frv/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes and return a 1.
  */
 int
-_DEFUN (_isatty, (fd),
-       int fd)
+_isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/frv/kill.c b/libgloss/frv/kill.c
index 8dda1e9a6..3be632ead 100644
--- a/libgloss/frv/kill.c
+++ b/libgloss/frv/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  * kill -- go out via exit...
  */
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/frv/print.c b/libgloss/frv/print.c
index 8c8be847a..3dc3d0fe8 100644
--- a/libgloss/frv/print.c
+++ b/libgloss/frv/print.c
@@ -18,8 +18,7 @@
  * print -- do a raw print of a string
  */ 
 void
-_DEFUN (_print, (ptr),
-char *ptr)
+_print (char *ptr)
 {
   while (*ptr) {
     outbyte (*ptr++);
diff --git a/libgloss/frv/putnum.c b/libgloss/frv/putnum.c
index c7fa12114..a07315e13 100644
--- a/libgloss/frv/putnum.c
+++ b/libgloss/frv/putnum.c
@@ -18,8 +18,7 @@
  * putnum -- print a 32 bit number in hex
  */
 void
-_DEFUN (_putnum, (num),
-	unsigned int num)
+_putnum (unsigned int num)
 {
   char  buf[9];
   int   cnt;
diff --git a/libgloss/frv/sim-time.c b/libgloss/frv/sim-time.c
index 196f855ad..7a6af4acb 100644
--- a/libgloss/frv/sim-time.c
+++ b/libgloss/frv/sim-time.c
@@ -38,8 +38,7 @@ extern time_t _sim_time (void) __asm__("_sim_time");
  * time -- return current time in seconds.
  */
 time_t
-_DEFUN (time, time (t),
-	time_t *t)
+time (time_t *t)
 {
   time_t ret = _sim_time ();
 
@@ -53,8 +52,7 @@ _DEFUN (time, time (t),
  * _times -- no clock, so return an error.
  */
 int
-_DEFUN (_times, _times (buf),
-	struct tms *buf)
+_times (struct tms *buf)
 {
   errno = EINVAL;
   return (-1);
@@ -65,8 +63,7 @@ _DEFUN (_times, _times (buf),
  * microseconds.
  */
 int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv,
+_gettimeofday (struct timeval *tv,
 	void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/frv/stat.c b/libgloss/frv/stat.c
index ceaedc216..b471f542c 100644
--- a/libgloss/frv/stat.c
+++ b/libgloss/frv/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_stat, (path, buf),
-       const char *path,
+_stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/fstat.c b/libgloss/fstat.c
index e7f913358..c9d14d103 100644
--- a/libgloss/fstat.c
+++ b/libgloss/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (fstat, (fd, buf),
-       int fd,
+fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/ft32/fstat.c b/libgloss/ft32/fstat.c
index 0bd432e58..517d13442 100644
--- a/libgloss/ft32/fstat.c
+++ b/libgloss/ft32/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_fstat, (fd, buf),
-       int fd,
+_fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;        /* Always pretend to be a tty */
diff --git a/libgloss/ft32/getpid.c b/libgloss/ft32/getpid.c
index 75bba424a..435d0933f 100644
--- a/libgloss/ft32/getpid.c
+++ b/libgloss/ft32/getpid.c
@@ -18,8 +18,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (_getpid, (),
-        )
+_getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/ft32/isatty.c b/libgloss/ft32/isatty.c
index fd2d73760..def8ff01c 100644
--- a/libgloss/ft32/isatty.c
+++ b/libgloss/ft32/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes and return a 1.
  */
 int
-_DEFUN (_isatty, (fd),
-       int fd)
+_isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/ft32/kill.c b/libgloss/ft32/kill.c
index 4b2241f56..06ec59c61 100644
--- a/libgloss/ft32/kill.c
+++ b/libgloss/ft32/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  * kill -- go out via exit...
  */
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/ft32/sim-lseek.S b/libgloss/ft32/sim-lseek.S
index c2a134ca1..488edf3df 100644
--- a/libgloss/ft32/sim-lseek.S
+++ b/libgloss/ft32/sim-lseek.S
@@ -22,8 +22,7 @@
  * an error.
  */
 off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd,
+_lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/ft32/sim-lseek.c b/libgloss/ft32/sim-lseek.c
index e5c08c8e7..d35e08272 100644
--- a/libgloss/ft32/sim-lseek.c
+++ b/libgloss/ft32/sim-lseek.c
@@ -22,8 +22,7 @@
  * an error.
  */
 off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd,
+_lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/ft32/sim-time.c b/libgloss/ft32/sim-time.c
index 8f417ebb7..9d2993b88 100644
--- a/libgloss/ft32/sim-time.c
+++ b/libgloss/ft32/sim-time.c
@@ -21,8 +21,7 @@
  * _times -- no clock, so return an error.
  */
 int
-_DEFUN (_times, _times (buf),
-        struct tms *buf)
+_times (struct tms *buf)
 {
   errno = EINVAL;
   return (-1);
@@ -33,8 +32,7 @@ _DEFUN (_times, _times (buf),
  * microseconds.
  */
 int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-        struct timeval *tv,
+_gettimeofday (struct timeval *tv,
         void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/ft32/stat.c b/libgloss/ft32/stat.c
index 4d738efe2..df7ef39ee 100644
--- a/libgloss/ft32/stat.c
+++ b/libgloss/ft32/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_stat, (path, buf),
-       const char *path,
+_stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/getpid.c b/libgloss/getpid.c
index 07f7f9279..9814fd539 100644
--- a/libgloss/getpid.c
+++ b/libgloss/getpid.c
@@ -18,8 +18,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (getpid, (),
-        )
+getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/isatty.c b/libgloss/isatty.c
index 675d99bc2..2b54861ea 100644
--- a/libgloss/isatty.c
+++ b/libgloss/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes, return a 1.
  */
 int
-_DEFUN (isatty, (fd),
-       int fd)
+isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/kill.c b/libgloss/kill.c
index ada45f6c8..a0eaee75b 100644
--- a/libgloss/kill.c
+++ b/libgloss/kill.c
@@ -18,8 +18,7 @@
  * kill -- go out via exit...
  */
 int
-_DEFUN (kill, (pid, sig),
-        int pid,
+kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/libnosys/_exit.c b/libgloss/libnosys/_exit.c
index 44d845b8c..731dea7f0 100644
--- a/libgloss/libnosys/_exit.c
+++ b/libgloss/libnosys/_exit.c
@@ -6,8 +6,7 @@
 #include <_syslist.h>
 
 void
-_DEFUN (_exit, (rc),
-	int rc)
+_exit (int rc)
 {
   /* Default stub just causes a divide by 0 exception.  */
   int x = rc / INT_MAX;
diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c
index 0ddb85d03..faea82be8 100644
--- a/libgloss/libnosys/chown.c
+++ b/libgloss/libnosys/chown.c
@@ -12,8 +12,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_chown, (path, owner, group),
-        const char *path,
+_chown (const char *path,
         uid_t owner,
         gid_t group)
 {
diff --git a/libgloss/libnosys/close.c b/libgloss/libnosys/close.c
index b759b86ee..8dc3e8b6a 100644
--- a/libgloss/libnosys/close.c
+++ b/libgloss/libnosys/close.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_close, (fildes),
-        int fildes)
+_close (int fildes)
 {
   errno = ENOSYS;
   return -1;
diff --git a/libgloss/libnosys/execve.c b/libgloss/libnosys/execve.c
index a93641a34..950a43c75 100644
--- a/libgloss/libnosys/execve.c
+++ b/libgloss/libnosys/execve.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_execve, (name, argv, env),
-        char  *name,
+_execve (char  *name,
         char **argv,
         char **env)
 {
diff --git a/libgloss/libnosys/fork.c b/libgloss/libnosys/fork.c
index 5fbf68b93..c4724a3f0 100644
--- a/libgloss/libnosys/fork.c
+++ b/libgloss/libnosys/fork.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_fork, (),
-        void)
+_fork (void)
 {
   errno = ENOSYS;
   return -1;
diff --git a/libgloss/libnosys/fstat.c b/libgloss/libnosys/fstat.c
index d04b40721..c85b9f209 100644
--- a/libgloss/libnosys/fstat.c
+++ b/libgloss/libnosys/fstat.c
@@ -13,8 +13,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_fstat, (fildes, st),
-        int          fildes,
+_fstat (int          fildes,
         struct stat *st)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/getpid.c b/libgloss/libnosys/getpid.c
index 9ed416c6b..f8d451e8b 100644
--- a/libgloss/libnosys/getpid.c
+++ b/libgloss/libnosys/getpid.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_getpid, (),
-        void)
+_getpid (void)
 {
   errno = ENOSYS;
   return -1;
diff --git a/libgloss/libnosys/gettod.c b/libgloss/libnosys/gettod.c
index 5e0b2db55..2b5354e72 100644
--- a/libgloss/libnosys/gettod.c
+++ b/libgloss/libnosys/gettod.c
@@ -15,8 +15,7 @@ extern int errno;
 struct timeval;
 
 int
-_DEFUN (_gettimeofday, (ptimeval, ptimezone),
-        struct timeval  *ptimeval,
+_gettimeofday (struct timeval  *ptimeval,
         void *ptimezone)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/isatty.c b/libgloss/libnosys/isatty.c
index d93e17702..a175bf992 100644
--- a/libgloss/libnosys/isatty.c
+++ b/libgloss/libnosys/isatty.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_isatty, (file),
-        int file)
+_isatty (int file)
 {
   errno = ENOSYS;
   return 0;
diff --git a/libgloss/libnosys/kill.c b/libgloss/libnosys/kill.c
index c58328794..27c4f8cf6 100644
--- a/libgloss/libnosys/kill.c
+++ b/libgloss/libnosys/kill.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/link.c b/libgloss/libnosys/link.c
index b27b5bca6..0bae1ef8e 100644
--- a/libgloss/libnosys/link.c
+++ b/libgloss/libnosys/link.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_link, (existing, new),
-        char *existing,
+_link (char *existing,
         char *new)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/lseek.c b/libgloss/libnosys/lseek.c
index f583a1461..fcc7be411 100644
--- a/libgloss/libnosys/lseek.c
+++ b/libgloss/libnosys/lseek.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_lseek, (file, ptr, dir),
-        int   file,
+_lseek (int   file,
         int   ptr,
         int   dir)
 {
diff --git a/libgloss/libnosys/open.c b/libgloss/libnosys/open.c
index ee8becedc..0c864a5ba 100644
--- a/libgloss/libnosys/open.c
+++ b/libgloss/libnosys/open.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_open, (file, flags, mode),
-        char *file,
+_open (char *file,
         int   flags,
         int   mode)
 {
diff --git a/libgloss/libnosys/read.c b/libgloss/libnosys/read.c
index 0ff3a9a8c..cfc281297 100644
--- a/libgloss/libnosys/read.c
+++ b/libgloss/libnosys/read.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_read, (file, ptr, len),
-        int   file,
+_read (int   file,
         char *ptr,
         int   len)
 {
diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c
index 00f3f8982..014c956f9 100644
--- a/libgloss/libnosys/readlink.c
+++ b/libgloss/libnosys/readlink.c
@@ -12,8 +12,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_readlink, (path, buf, bufsize),
-        const char *path,
+_readlink (const char *path,
         char *buf,
         size_t bufsize)
 {
diff --git a/libgloss/libnosys/stat.c b/libgloss/libnosys/stat.c
index 9fa7003d1..734f67289 100644
--- a/libgloss/libnosys/stat.c
+++ b/libgloss/libnosys/stat.c
@@ -13,8 +13,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_stat, (file, st),
-        const char  *file,
+_stat (const char  *file,
         struct stat *st)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c
index cf7a15896..bebfbba52 100644
--- a/libgloss/libnosys/symlink.c
+++ b/libgloss/libnosys/symlink.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_symlink, (path1, path2),
-        const char *path1,
+_symlink (const char *path1,
         const char *path2)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/times.c b/libgloss/libnosys/times.c
index f205e50f5..908cd8d12 100644
--- a/libgloss/libnosys/times.c
+++ b/libgloss/libnosys/times.c
@@ -12,8 +12,7 @@ extern int errno;
 #include "warning.h"
 
 clock_t
-_DEFUN (_times, (buf),
-        struct tms *buf)
+_times (struct tms *buf)
 {
   errno = ENOSYS;
   return -1;
diff --git a/libgloss/libnosys/unlink.c b/libgloss/libnosys/unlink.c
index c543709e4..3414bf82c 100644
--- a/libgloss/libnosys/unlink.c
+++ b/libgloss/libnosys/unlink.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_unlink, (name),
-        char *name)
+_unlink (char *name)
 {
   errno = ENOSYS;
   return -1;
diff --git a/libgloss/libnosys/wait.c b/libgloss/libnosys/wait.c
index 2a785be1f..029dcbcd4 100644
--- a/libgloss/libnosys/wait.c
+++ b/libgloss/libnosys/wait.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_wait, (status),
-        int  *status)
+_wait (int  *status)
 {
   errno = ENOSYS;
   return -1;
diff --git a/libgloss/libnosys/write.c b/libgloss/libnosys/write.c
index 0ada7702b..33d727bbf 100644
--- a/libgloss/libnosys/write.c
+++ b/libgloss/libnosys/write.c
@@ -11,8 +11,7 @@ extern int errno;
 #include "warning.h"
 
 int
-_DEFUN (_write, (file, ptr, len),
-        int   file,
+_write (int   file,
         char *ptr,
         int   len)
 {
diff --git a/libgloss/lm32/isatty.c b/libgloss/lm32/isatty.c
index 69833fa07..d90b4df08 100644
--- a/libgloss/lm32/isatty.c
+++ b/libgloss/lm32/isatty.c
@@ -33,8 +33,7 @@
  *           other files are not. 
  */
 int
-_DEFUN (_isatty, (fd),
-       int fd)
+_isatty (int fd)
 {
   if ((fd == 0) || (fd == 1) || (fd == 2))
     return 1;
diff --git a/libgloss/lseek.c b/libgloss/lseek.c
index 42a28d966..2fde60d8d 100644
--- a/libgloss/lseek.c
+++ b/libgloss/lseek.c
@@ -20,8 +20,7 @@
  * lseek --  Since a serial port is non-seekable, we return an error.
  */
 off_t
-_DEFUN (lseek, (fd,  offset, whence),
-       int fd,
+lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/m68k/idp-outbyte.c b/libgloss/m68k/idp-outbyte.c
index a95dc0c53..761d679f7 100644
--- a/libgloss/m68k/idp-outbyte.c
+++ b/libgloss/m68k/idp-outbyte.c
@@ -32,8 +32,7 @@
  *           to channel A.
  */
 static void
-_DEFUN (raw_outbyte, (byte),
-	char byte)
+raw_outbyte (char byte)
 {
   /* First, wait for the UART to finish clocking out the last
      character we sent, if any.  Then, give it the next character to
@@ -64,8 +63,7 @@ _DEFUN (raw_outbyte, (byte),
  *      latter we put in libidp.a, which is selected by idp.ld.
  */
 void
-_DEFUN (outbyte, (byte),
-        char byte)
+outbyte (char byte)
 {
 #ifdef GDB_MONITOR_OUTPUT
   raw_outbyte (0x0f);
diff --git a/libgloss/m68k/mc68ec.c b/libgloss/m68k/mc68ec.c
index d5ee9b5fe..76e737fe7 100644
--- a/libgloss/m68k/mc68ec.c
+++ b/libgloss/m68k/mc68ec.c
@@ -25,8 +25,7 @@
  *          prompt. It can be restarted from there.
  */
 void
-_DEFUN (_exit, (status),
-	int_status)
+_exit (int_status)
 {
   /* Use `i' constraint to get proper immediate-operand syntax for
      target assembler configuration.  */
@@ -38,8 +37,7 @@ _DEFUN (_exit, (status),
  *          use the timer, but I'm waiting for docs. (sigh)
  */
 void
-_DEFUN (delay, (num),
-        int num)
+delay (int num)
 {
   while (num--)
     {
diff --git a/libgloss/mcore/close.c b/libgloss/mcore/close.c
index b94cb602a..0a9f81141 100644
--- a/libgloss/mcore/close.c
+++ b/libgloss/mcore/close.c
@@ -18,8 +18,7 @@
  * close -- We don't need to do anything, but pretend we did.
  */
 int
-_DEFUN (_close ,(fd),
-       int fd)
+_close  (int fd)
 {
   return (0);
 }
diff --git a/libgloss/mcore/cmb-exit.c b/libgloss/mcore/cmb-exit.c
index 0e1de85f3..84703eb0d 100644
--- a/libgloss/mcore/cmb-exit.c
+++ b/libgloss/mcore/cmb-exit.c
@@ -18,8 +18,7 @@
  * _exit --  Just cause a breakpoint so user can see why we exited.
  */
 void
-_DEFUN (_exit, (val),
-       int val)
+_exit (int val)
 {
     while (1) {
 	asm("bkpt");
diff --git a/libgloss/mcore/cmb-inbyte.c b/libgloss/mcore/cmb-inbyte.c
index 839ffe605..9bfbbde81 100644
--- a/libgloss/mcore/cmb-inbyte.c
+++ b/libgloss/mcore/cmb-inbyte.c
@@ -15,8 +15,7 @@
 #include <_ansi.h>
 
 int
-_DEFUN (inbyte, (),
-	void)
+inbyte (void)
 
 {
     return -1;
diff --git a/libgloss/mcore/cmb-outbyte.c b/libgloss/mcore/cmb-outbyte.c
index ea2aaef8b..ea31cc5af 100644
--- a/libgloss/mcore/cmb-outbyte.c
+++ b/libgloss/mcore/cmb-outbyte.c
@@ -33,8 +33,7 @@
  * outbyte -- send a byte to the UART.
  */
 void
-_DEFUN (outbyte, (ch),
-	char ch)
+outbyte (char ch)
 {
     while (!(*SRREG & TRDY))
 	;
diff --git a/libgloss/mcore/fstat.c b/libgloss/mcore/fstat.c
index 6a2323a6e..671f56ad9 100644
--- a/libgloss/mcore/fstat.c
+++ b/libgloss/mcore/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_fstat, (fd, buf),
-       int fd,
+_fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/mcore/getpid.c b/libgloss/mcore/getpid.c
index eee2ac030..cc9e85749 100644
--- a/libgloss/mcore/getpid.c
+++ b/libgloss/mcore/getpid.c
@@ -18,8 +18,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (_getpid, (),
-        )
+_getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/mcore/kill.c b/libgloss/mcore/kill.c
index 8883c8ecd..833fe89d7 100644
--- a/libgloss/mcore/kill.c
+++ b/libgloss/mcore/kill.c
@@ -18,8 +18,7 @@
  * kill -- go out via exit...
  */
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/mcore/lseek.c b/libgloss/mcore/lseek.c
index 423e11e55..dc419c753 100644
--- a/libgloss/mcore/lseek.c
+++ b/libgloss/mcore/lseek.c
@@ -20,8 +20,7 @@
  * lseek --  Since a serial port is non-seekable, we return an error.
  */
 off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd,
+_lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/mcore/open.c b/libgloss/mcore/open.c
index 6b816e891..fdc1b3081 100644
--- a/libgloss/mcore/open.c
+++ b/libgloss/mcore/open.c
@@ -20,8 +20,7 @@
  *         we return an error.
  */
 int
-_DEFUN (_open, (buf, flags, mode),
-       const char *buf,
+_open (const char *buf,
        int flags,
        int mode)
 {
diff --git a/libgloss/mcore/print.c b/libgloss/mcore/print.c
index d0d2bcef7..f5d0dba20 100644
--- a/libgloss/mcore/print.c
+++ b/libgloss/mcore/print.c
@@ -18,8 +18,7 @@
  * print -- do a raw print of a string
  */ 
 void
-_DEFUN (_print, (ptr),
-char *ptr)
+_print (char *ptr)
 {
   while (*ptr) {
     outbyte (*ptr++);
diff --git a/libgloss/mcore/putnum.c b/libgloss/mcore/putnum.c
index 2e37c0993..10e298b95 100644
--- a/libgloss/mcore/putnum.c
+++ b/libgloss/mcore/putnum.c
@@ -18,8 +18,7 @@
  * putnum -- print a 32 bit number in hex
  */
 void
-_DEFUN (_putnum, (num),
-	unsigned int num)
+_putnum (unsigned int num)
 {
   char  buf[9];
   int   cnt;
diff --git a/libgloss/mcore/raise.c b/libgloss/mcore/raise.c
index 6657aa649..e39207792 100644
--- a/libgloss/mcore/raise.c
+++ b/libgloss/mcore/raise.c
@@ -15,8 +15,7 @@
 #include "glue.h"
 
 int
-_DEFUN (_raise, (sig),
-	int sig)
+_raise (int sig)
 {
   return _kill (_getpid (), sig);
 }
diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c
index d97d98d22..d7c5670b0 100644
--- a/libgloss/mcore/read.c
+++ b/libgloss/mcore/read.c
@@ -21,8 +21,7 @@ extern char inbyte (void);
  *          we only have stdin.
  */
 int
-_DEFUN (_read, (fd, buf, nbytes),
-       int fd,
+_read (int fd,
        char *buf,
        int nbytes)
 {
diff --git a/libgloss/mcore/stat.c b/libgloss/mcore/stat.c
index d07042a51..1e16e0e53 100644
--- a/libgloss/mcore/stat.c
+++ b/libgloss/mcore/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_stat, (path, buf),
-       const char *path,
+_stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/mcore/unlink.c b/libgloss/mcore/unlink.c
index 16dda14f2..9cbcfc53c 100644
--- a/libgloss/mcore/unlink.c
+++ b/libgloss/mcore/unlink.c
@@ -20,8 +20,7 @@
  *           we just return an error.
  */
 int
-_DEFUN (_unlink, (path),
-        char * path)
+_unlink (char * path)
 {
   errno = EIO;
   return (-1);
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 189ea6222..87dca10a1 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -22,8 +22,7 @@ extern int  _EXFUN (outbyte, (char x));
  *          open will only return an error.
  */
 int
-_DEFUN (_write, (fd, buf, nbytes),
-       int fd,
+_write (int fd,
        char *buf,
        int nbytes)
 {
diff --git a/libgloss/moxie/fstat.c b/libgloss/moxie/fstat.c
index 38dd07b34..78dd9328e 100644
--- a/libgloss/moxie/fstat.c
+++ b/libgloss/moxie/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_fstat, (fd, buf),
-       int fd,
+_fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/moxie/getpid.c b/libgloss/moxie/getpid.c
index 957eee746..93704ceb9 100644
--- a/libgloss/moxie/getpid.c
+++ b/libgloss/moxie/getpid.c
@@ -18,8 +18,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (_getpid, (),
-        )
+_getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/moxie/isatty.c b/libgloss/moxie/isatty.c
index 73ade0741..f986aa725 100644
--- a/libgloss/moxie/isatty.c
+++ b/libgloss/moxie/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes and return a 1.
  */
 int
-_DEFUN (_isatty, (fd),
-       int fd)
+_isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/moxie/kill.c b/libgloss/moxie/kill.c
index d602829ce..623f158f4 100644
--- a/libgloss/moxie/kill.c
+++ b/libgloss/moxie/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  * kill -- go out via exit...
  */
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/moxie/print.c b/libgloss/moxie/print.c
index a20743ac6..1857258cd 100644
--- a/libgloss/moxie/print.c
+++ b/libgloss/moxie/print.c
@@ -18,8 +18,7 @@
  * print -- do a raw print of a string
  */ 
 void
-_DEFUN (_print, (ptr),
-char *ptr)
+_print (char *ptr)
 {
   while (*ptr) {
     outbyte (*ptr++);
diff --git a/libgloss/moxie/putnum.c b/libgloss/moxie/putnum.c
index f5bac1f2b..0f7e89453 100644
--- a/libgloss/moxie/putnum.c
+++ b/libgloss/moxie/putnum.c
@@ -18,8 +18,7 @@
  * putnum -- print a 32 bit number in hex
  */
 void
-_DEFUN (_putnum, (num),
-	unsigned int num)
+_putnum (unsigned int num)
 {
   char  buf[9];
   int   cnt;
diff --git a/libgloss/moxie/qemu-time.c b/libgloss/moxie/qemu-time.c
index 1abd5a9f7..0049c24ee 100644
--- a/libgloss/moxie/qemu-time.c
+++ b/libgloss/moxie/qemu-time.c
@@ -40,8 +40,7 @@
  * _times -- FIXME
  */
 int
-_DEFUN (_times, _times (buf),
-	struct tms *buf)
+_times (struct tms *buf)
 {
   errno = EINVAL;
   return (-1);
@@ -70,8 +69,7 @@ rtc_write (unsigned char reg, unsigned char val)
  * time -- return current time in seconds.
  */
 time_t
-_DEFUN (time, time (t),
-	time_t *t)
+time (time_t *t)
 {
   struct tm tm;
   time_t ret;
@@ -100,8 +98,7 @@ _DEFUN (time, time (t),
  * return the microseconds.
  */
 int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv,
+_gettimeofday (struct timeval *tv,
 	void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/sim-lseek.S b/libgloss/moxie/sim-lseek.S
index 5e5493cd7..86fb67504 100644
--- a/libgloss/moxie/sim-lseek.S
+++ b/libgloss/moxie/sim-lseek.S
@@ -22,8 +22,7 @@
  * an error.
  */
 off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd,
+_lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/moxie/sim-lseek.c b/libgloss/moxie/sim-lseek.c
index d22d7226c..dacd769af 100644
--- a/libgloss/moxie/sim-lseek.c
+++ b/libgloss/moxie/sim-lseek.c
@@ -22,8 +22,7 @@
  * an error.
  */
 off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd,
+_lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/moxie/sim-time.c b/libgloss/moxie/sim-time.c
index d3f43d385..53793bfe1 100644
--- a/libgloss/moxie/sim-time.c
+++ b/libgloss/moxie/sim-time.c
@@ -37,8 +37,7 @@ extern time_t _sim_time (void) __asm__("_sim_time");
  * time -- return current time in seconds.
  */
 time_t
-_DEFUN (time, time (t),
-	time_t *t)
+time (time_t *t)
 {
   time_t ret = _sim_time ();
 
@@ -52,8 +51,7 @@ _DEFUN (time, time (t),
  * _times -- no clock, so return an error.
  */
 int
-_DEFUN (_times, _times (buf),
-	struct tms *buf)
+_times (struct tms *buf)
 {
   errno = EINVAL;
   return (-1);
@@ -64,8 +62,7 @@ _DEFUN (_times, _times (buf),
  * microseconds.
  */
 int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv,
+_gettimeofday (struct timeval *tv,
 	void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/stat.c b/libgloss/moxie/stat.c
index 01a958210..c80e8d347 100644
--- a/libgloss/moxie/stat.c
+++ b/libgloss/moxie/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_stat, (path, buf),
-       const char *path,
+_stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/open.c b/libgloss/open.c
index 90787b1b9..a0eb1717b 100644
--- a/libgloss/open.c
+++ b/libgloss/open.c
@@ -20,8 +20,7 @@
  *         we return an error.
  */
 int
-_DEFUN (open, (buf, flags, mode),
-       const char *buf,
+open (const char *buf,
        int flags,
        int mode)
 {
diff --git a/libgloss/print.c b/libgloss/print.c
index 8f78ff2af..76d543b67 100644
--- a/libgloss/print.c
+++ b/libgloss/print.c
@@ -18,8 +18,7 @@
  * print -- do a raw print of a string
  */ 
 void
-_DEFUN (print, (ptr),
-char *ptr)
+print (char *ptr)
 {
   while (*ptr) {
     outbyte (*ptr++);
diff --git a/libgloss/putnum.c b/libgloss/putnum.c
index 842e10f07..c368c4136 100644
--- a/libgloss/putnum.c
+++ b/libgloss/putnum.c
@@ -18,8 +18,7 @@
  * putnum -- print a 32 bit number in hex
  */
 void
-_DEFUN (putnum, (num),
-	unsigned int num)
+putnum (unsigned int num)
 {
   char  buf[9];
   int   cnt;
diff --git a/libgloss/read.c b/libgloss/read.c
index 507c9802f..24108ce0d 100644
--- a/libgloss/read.c
+++ b/libgloss/read.c
@@ -21,8 +21,7 @@ extern char inbyte (void);
  *          we only have stdin.
  */
 int
-_DEFUN (read, (fd, buf, nbytes),
-       int fd,
+read (int fd,
        char *buf,
        int nbytes)
 {
diff --git a/libgloss/spu/getpid.c b/libgloss/spu/getpid.c
index ff2d82028..89361720f 100644
--- a/libgloss/spu/getpid.c
+++ b/libgloss/spu/getpid.c
@@ -31,7 +31,7 @@ Author: Andreas Neukoetter (ti95neuk@de.ibm.com)
 */
 
 int
-getpid ()
+getpid (void)
 {
 	return (1);
 }
diff --git a/libgloss/stat.c b/libgloss/stat.c
index 5957645c6..4d6312830 100644
--- a/libgloss/stat.c
+++ b/libgloss/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (stat, (path, buf),
-       const char *path,
+stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/tic6x/getpid.c b/libgloss/tic6x/getpid.c
index 3c1a7b8b8..912ca18a5 100644
--- a/libgloss/tic6x/getpid.c
+++ b/libgloss/tic6x/getpid.c
@@ -19,8 +19,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (getpid, (),
-        )
+getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/tic6x/kill.c b/libgloss/tic6x/kill.c
index db5018cfc..98cd3c40e 100644
--- a/libgloss/tic6x/kill.c
+++ b/libgloss/tic6x/kill.c
@@ -19,8 +19,7 @@
  * kill -- go out via exit...
  */
 int
-_DEFUN (kill, (pid, sig),
-        int pid,
+kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/unlink.c b/libgloss/unlink.c
index 15ea7e8a9..76c1a4fef 100644
--- a/libgloss/unlink.c
+++ b/libgloss/unlink.c
@@ -20,8 +20,7 @@
  *           we just return an error.
  */
 int
-_DEFUN (unlink, (path),
-        char * path)
+unlink (char * path)
 {
   errno = EIO;
   return (-1);
diff --git a/libgloss/write.c b/libgloss/write.c
index 69f452c34..4b25cfce7 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -22,8 +22,7 @@ extern int  _EXFUN (outbyte, (char x));
  *          open will only return an error.
  */
 int
-_DEFUN (write, (fd, buf, nbytes),
-       int fd,
+write (int fd,
        char *buf,
        int nbytes)
 {
diff --git a/libgloss/xc16x/misc.c b/libgloss/xc16x/misc.c
index 2eb951a5a..d96550129 100644
--- a/libgloss/xc16x/misc.c
+++ b/libgloss/xc16x/misc.c
@@ -17,21 +17,19 @@
 /* _raise(), getpid(), and kill() are required by abort().
    getpid/kill are prefixed with '_' because of MISSING_SYSCALL_NAMES.  */
 
-int _DEFUN(_raise,(sig),
-	   int sig)
+int _raise (int sig)
 {
   errno = ENOSYS;
   return -1;
 }
 
-int _DEFUN(_getpid,(),)
+int _getpid (void)
 {
   errno = ENOSYS;
   return -1;
 }
 
-int _DEFUN(_kill,(pid, sig),
-	   int pid,
+int _kill (int pid,
 	   int sig)
 {
   errno = ENOSYS;
diff --git a/libgloss/xstormy16/close.c b/libgloss/xstormy16/close.c
index 5fcfbf576..2b50e6432 100644
--- a/libgloss/xstormy16/close.c
+++ b/libgloss/xstormy16/close.c
@@ -18,8 +18,7 @@
  * close -- We don't need to do anything, but pretend we did.
  */
 int
-_DEFUN (_close ,(fd),
-       int fd)
+_close  (int fd)
 {
   return (0);
 }
diff --git a/libgloss/xstormy16/fstat.c b/libgloss/xstormy16/fstat.c
index 2926ccaab..b962036f3 100644
--- a/libgloss/xstormy16/fstat.c
+++ b/libgloss/xstormy16/fstat.c
@@ -19,8 +19,7 @@
  * fstat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_fstat, (fd, buf),
-       int fd,
+_fstat (int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
diff --git a/libgloss/xstormy16/getpid.c b/libgloss/xstormy16/getpid.c
index 0f081a11d..e49fde4a0 100644
--- a/libgloss/xstormy16/getpid.c
+++ b/libgloss/xstormy16/getpid.c
@@ -18,8 +18,7 @@
  * getpid -- only one process, so just return 1.
  */
 int
-_DEFUN (_getpid, (),
-        )
+_getpid (void)
 {
   return __MYPID;
 }
diff --git a/libgloss/xstormy16/isatty.c b/libgloss/xstormy16/isatty.c
index 0e92a9f4f..f7d8fa098 100644
--- a/libgloss/xstormy16/isatty.c
+++ b/libgloss/xstormy16/isatty.c
@@ -20,8 +20,7 @@
  *           serial port, we'll say yes and return a 1.
  */
 int
-_DEFUN (_isatty, (fd),
-       int fd)
+_isatty (int fd)
 {
   return (1);
 }
diff --git a/libgloss/xstormy16/kill.c b/libgloss/xstormy16/kill.c
index 2374dc29d..f5ccd2191 100644
--- a/libgloss/xstormy16/kill.c
+++ b/libgloss/xstormy16/kill.c
@@ -18,8 +18,7 @@
  * kill -- go out via exit...
  */
 int
-_DEFUN (_kill, (pid, sig),
-        int pid,
+_kill (int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/xstormy16/lseek.c b/libgloss/xstormy16/lseek.c
index 11dbab08e..c00665723 100644
--- a/libgloss/xstormy16/lseek.c
+++ b/libgloss/xstormy16/lseek.c
@@ -20,8 +20,7 @@
  * lseek --  Since a serial port is non-seekable, we return an error.
  */
 off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd,
+_lseek (int fd,
        off_t offset,
        int whence)
 {
diff --git a/libgloss/xstormy16/open.c b/libgloss/xstormy16/open.c
index 600f92982..f96484c7b 100644
--- a/libgloss/xstormy16/open.c
+++ b/libgloss/xstormy16/open.c
@@ -20,8 +20,7 @@
  *         we return an error.
  */
 int
-_DEFUN (_open, (buf, flags, mode),
-       const char *buf,
+_open (const char *buf,
        int flags,
        int mode)
 {
diff --git a/libgloss/xstormy16/stat.c b/libgloss/xstormy16/stat.c
index b80b83c6c..7d089edfa 100644
--- a/libgloss/xstormy16/stat.c
+++ b/libgloss/xstormy16/stat.c
@@ -20,8 +20,7 @@
  * stat -- Since we have no file system, we just return an error.
  */
 int
-_DEFUN (_stat, (path, buf),
-       const char *path,
+_stat (const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/xstormy16/unlink.c b/libgloss/xstormy16/unlink.c
index 1c56663ea..10180ac9b 100644
--- a/libgloss/xstormy16/unlink.c
+++ b/libgloss/xstormy16/unlink.c
@@ -20,8 +20,7 @@
  *           we just return an error.
  */
 int
-_DEFUN (_unlink, (path),
-        char * path)
+_unlink (char * path)
 {
   errno = EIO;
   return (-1);
diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
index 3194f0851..a1a8d3d0e 100644
--- a/newlib/libc/argz/argz_add.c
+++ b/newlib/libc/argz/argz_add.c
@@ -11,8 +11,7 @@
 #include <stdlib.h>
 
 error_t
-_DEFUN (argz_add, (argz, argz_len, str),
-       char **argz,
+argz_add (char **argz,
        size_t *argz_len,
        const char *str)
 {
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
index 92c73716d..f2964e672 100644
--- a/newlib/libc/argz/argz_add_sep.c
+++ b/newlib/libc/argz/argz_add_sep.c
@@ -11,8 +11,7 @@
 #include <argz.h>
 
 error_t
-_DEFUN (argz_add_sep, (argz, argz_len, str, sep),
-       char **argz,
+argz_add_sep (char **argz,
        size_t *argz_len,
        const char *str,
        int sep)
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
index a84f8e0b9..de0cc82ce 100644
--- a/newlib/libc/argz/argz_append.c
+++ b/newlib/libc/argz/argz_append.c
@@ -11,8 +11,7 @@
 #include <stdlib.h>
 
 error_t
-_DEFUN (argz_append, (argz, argz_len, buf, buf_len),
-       char **argz,
+argz_append (char **argz,
        size_t *argz_len,
        const char *buf,
        size_t buf_len)
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
index 33d0eecc2..4c0007ce2 100644
--- a/newlib/libc/argz/argz_count.c
+++ b/newlib/libc/argz/argz_count.c
@@ -10,8 +10,7 @@
 #include <sys/types.h>
 
 size_t
-_DEFUN (argz_count, (argz, argz_len), 
-       const char *argz,
+argz_count (const char *argz,
        size_t argz_len)
 {
   int i;
diff --git a/newlib/libc/argz/argz_create.c b/newlib/libc/argz/argz_create.c
index d4b8b0592..4ab622d28 100644
--- a/newlib/libc/argz/argz_create.c
+++ b/newlib/libc/argz/argz_create.c
@@ -11,8 +11,7 @@
 #include <stdlib.h>
 
 error_t
-_DEFUN (argz_create, (argv, argz, argz_len),
-       char *const argv[],
+argz_create (char *const argv[],
        char **argz,
        size_t *argz_len)
 {
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
index afff44c1e..bf578e6bb 100644
--- a/newlib/libc/argz/argz_create_sep.c
+++ b/newlib/libc/argz/argz_create_sep.c
@@ -11,8 +11,7 @@
 #include <stdlib.h>
 
 error_t
-_DEFUN (argz_create_sep, (string, sep, argz, argz_len),
-       const char *string,
+argz_create_sep (const char *string,
        int sep,
        char **argz,
        size_t *argz_len)
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
index a4e12273d..aa1fe4c75 100644
--- a/newlib/libc/argz/argz_delete.c
+++ b/newlib/libc/argz/argz_delete.c
@@ -11,8 +11,7 @@
 #include <stdlib.h>
 
 error_t
-_DEFUN (argz_delete, (argz, argz_len, entry),
-       char **argz,
+argz_delete (char **argz,
        size_t *argz_len,
        char *entry)
 {
diff --git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
index 4932de6a9..e97b76905 100644
--- a/newlib/libc/argz/argz_extract.c
+++ b/newlib/libc/argz/argz_extract.c
@@ -9,8 +9,7 @@
 #include <sys/types.h>
 
 void
-_DEFUN (argz_extract, (argz, argz_len, argv),
-       char *argz,
+argz_extract (char *argz,
        size_t argz_len,
        char **argv)
 {
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index 5965e04a6..abdfeb0ea 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -13,8 +13,7 @@
 #include <stddef.h>
 
 error_t
-_DEFUN (argz_insert, (argz, argz_len, before, entry),
-       char **argz,
+argz_insert (char **argz,
        size_t *argz_len,
        char *before,
        const char *entry)
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
index 3f672217e..0d6f21d70 100644
--- a/newlib/libc/argz/argz_next.c
+++ b/newlib/libc/argz/argz_next.c
@@ -11,8 +11,7 @@
 #include <stdlib.h>
 
 char *
-_DEFUN (argz_next, (argz, argz_len, entry),
-       char *argz,
+argz_next (char *argz,
        size_t argz_len,
        const char *entry)
 {
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
index e6c6ead3e..f2e0d52b7 100644
--- a/newlib/libc/argz/argz_replace.c
+++ b/newlib/libc/argz/argz_replace.c
@@ -13,8 +13,7 @@
 #include "buf_findstr.h"
 
 error_t
-_DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
-       char **argz,
+argz_replace (char **argz,
        size_t *argz_len,
        const char *str,
        const char *with,
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
index 72895f5e7..98f6c9bc2 100644
--- a/newlib/libc/argz/argz_stringify.c
+++ b/newlib/libc/argz/argz_stringify.c
@@ -10,8 +10,7 @@
 #include <sys/types.h>
 
 void
-_DEFUN (argz_stringify, (argz, argz_len, sep),
-       char *argz,
+argz_stringify (char *argz,
        size_t argz_len,
        int sep)
 {
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
index f01d09926..60ecf17bc 100644
--- a/newlib/libc/argz/envz_add.c
+++ b/newlib/libc/argz/envz_add.c
@@ -12,8 +12,7 @@
 #include <envz.h>
 
 error_t
-_DEFUN (envz_add, (envz, envz_len, name, value),
-       char **envz,
+envz_add (char **envz,
        size_t *envz_len,
        const char *name,
        const char *value)
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
index bbe38529e..869c332ad 100644
--- a/newlib/libc/argz/envz_entry.c
+++ b/newlib/libc/argz/envz_entry.c
@@ -13,8 +13,7 @@
 #include "buf_findstr.h"
 
 char *
-_DEFUN (envz_entry, (envz, envz_len, name),
-       const char *envz,
+envz_entry (const char *envz,
        size_t envz_len,
        const char *name)
 {
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
index 62d3d0cff..9863642c7 100644
--- a/newlib/libc/argz/envz_get.c
+++ b/newlib/libc/argz/envz_get.c
@@ -13,8 +13,7 @@
 #include "buf_findstr.h"
 
 char *
-_DEFUN (envz_get, (envz, envz_len, name),
-       const char *envz,
+envz_get (const char *envz,
        size_t envz_len,
        const char *name)
 {
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
index 9299069e4..3be7c1fbc 100644
--- a/newlib/libc/argz/envz_merge.c
+++ b/newlib/libc/argz/envz_merge.c
@@ -12,8 +12,7 @@
 #include <envz.h>
 
 error_t
-_DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
-       char **envz,
+envz_merge (char **envz,
        size_t *envz_len,
        const char *envz2,
        size_t envz2_len,
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
index 2558656aa..8fc9e8f16 100644
--- a/newlib/libc/argz/envz_remove.c
+++ b/newlib/libc/argz/envz_remove.c
@@ -12,8 +12,7 @@
 #include <envz.h>
 
 void
-_DEFUN (envz_remove, (envz, envz_len, name),
-       char **envz,
+envz_remove (char **envz,
        size_t *envz_len,
        const char *name)
 {
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
index 857f8492e..8efa5cbb5 100644
--- a/newlib/libc/argz/envz_strip.c
+++ b/newlib/libc/argz/envz_strip.c
@@ -12,8 +12,7 @@
 #include <envz.h>
 
 void
-_DEFUN (envz_strip, (envz, envz_len),
-       char **envz,
+envz_strip (char **envz,
        size_t *envz_len)
 {
   char *entry = 0;
diff --git a/newlib/libc/ctype/isalnum.c b/newlib/libc/ctype/isalnum.c
index ebb414c69..d926f97b7 100644
--- a/newlib/libc/ctype/isalnum.c
+++ b/newlib/libc/ctype/isalnum.c
@@ -44,7 +44,7 @@ No OS subroutines are required.
 #undef isalnum
 
 int
-_DEFUN(isalnum,(c),int c)
+isalnum (int c)
 {
 	return(__CTYPE_PTR[c+1] & (_U|_L|_N));
 }
diff --git a/newlib/libc/ctype/isalpha.c b/newlib/libc/ctype/isalpha.c
index 7a737a527..8b8e78a29 100644
--- a/newlib/libc/ctype/isalpha.c
+++ b/newlib/libc/ctype/isalpha.c
@@ -43,7 +43,7 @@ No supporting OS subroutines are required.
 
 #undef isalpha
 int
-_DEFUN(isalpha,(c),int c)
+isalpha (int c)
 {
 	return(__CTYPE_PTR[c+1] & (_U|_L));
 }
diff --git a/newlib/libc/ctype/isascii.c b/newlib/libc/ctype/isascii.c
index 71f299fa0..5adb81222 100644
--- a/newlib/libc/ctype/isascii.c
+++ b/newlib/libc/ctype/isascii.c
@@ -44,7 +44,7 @@ No supporting OS subroutines are required.
 #undef isascii
 
 int 
-_DEFUN(isascii,(c),int c)
+isascii (int c)
 {
 	return c >= 0 && c< 128;
 }
diff --git a/newlib/libc/ctype/isblank.c b/newlib/libc/ctype/isblank.c
index e054b947c..0ebc2192c 100644
--- a/newlib/libc/ctype/isblank.c
+++ b/newlib/libc/ctype/isblank.c
@@ -42,7 +42,7 @@ No supporting OS subroutines are required.
 
 #undef isblank
 int
-_DEFUN(isblank,(c),int c)
+isblank (int c)
 {
 	return ((__CTYPE_PTR[c+1] & _B) || (c == '\t'));
 }
diff --git a/newlib/libc/ctype/iscntrl.c b/newlib/libc/ctype/iscntrl.c
index b57b71790..ebbdd7371 100644
--- a/newlib/libc/ctype/iscntrl.c
+++ b/newlib/libc/ctype/iscntrl.c
@@ -46,7 +46,7 @@ No supporting OS subroutines are required.
 
 #undef iscntrl
 int
-_DEFUN(iscntrl,(c),int c)
+iscntrl (int c)
 {
 	return(__CTYPE_PTR[c+1] & _C);
 }
diff --git a/newlib/libc/ctype/isdigit.c b/newlib/libc/ctype/isdigit.c
index 5cd411b65..a5c511964 100644
--- a/newlib/libc/ctype/isdigit.c
+++ b/newlib/libc/ctype/isdigit.c
@@ -45,7 +45,7 @@ No supporting OS subroutines are required.
 
 #undef isdigit
 int
-_DEFUN(isdigit,(c),int c)
+isdigit (int c)
 {
 	return(__CTYPE_PTR[c+1] & _N);
 }
diff --git a/newlib/libc/ctype/islower.c b/newlib/libc/ctype/islower.c
index a6fb889a1..2b3440489 100644
--- a/newlib/libc/ctype/islower.c
+++ b/newlib/libc/ctype/islower.c
@@ -43,7 +43,7 @@ No supporting OS subroutines are required.
 
 #undef islower
 int
-_DEFUN(islower,(c),int c)
+islower (int c)
 {
 	return ((__CTYPE_PTR[c+1] & (_U|_L)) == _L);
 }
diff --git a/newlib/libc/ctype/isprint.c b/newlib/libc/ctype/isprint.c
index afabe8b1d..e34fbe28a 100644
--- a/newlib/libc/ctype/isprint.c
+++ b/newlib/libc/ctype/isprint.c
@@ -57,7 +57,7 @@ No supporting OS subroutines are required.
 
 #undef isgraph
 int
-_DEFUN(isgraph,(c),int c)
+isgraph (int c)
 {
 	return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N));
 }
@@ -65,7 +65,7 @@ _DEFUN(isgraph,(c),int c)
 
 #undef isprint
 int
-_DEFUN(isprint,(c),int c)
+isprint (int c)
 {
 	return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N|_B));
 }
diff --git a/newlib/libc/ctype/ispunct.c b/newlib/libc/ctype/ispunct.c
index 83796dc1c..9c5a3fcca 100644
--- a/newlib/libc/ctype/ispunct.c
+++ b/newlib/libc/ctype/ispunct.c
@@ -45,7 +45,7 @@ No supporting OS subroutines are required.
 
 #undef ispunct
 int
-_DEFUN(ispunct,(c),int c)
+ispunct (int c)
 {
 	return(__CTYPE_PTR[c+1] & _P);
 }
diff --git a/newlib/libc/ctype/isspace.c b/newlib/libc/ctype/isspace.c
index 68dc5cb1d..0def2c0ce 100644
--- a/newlib/libc/ctype/isspace.c
+++ b/newlib/libc/ctype/isspace.c
@@ -44,7 +44,7 @@ No supporting OS subroutines are required.
 
 #undef isspace
 int
-_DEFUN(isspace,(c),int c)
+isspace (int c)
 {
 	return(__CTYPE_PTR[c+1] & _S);
 }
diff --git a/newlib/libc/ctype/isupper.c b/newlib/libc/ctype/isupper.c
index 10fa230bd..aeed383ec 100644
--- a/newlib/libc/ctype/isupper.c
+++ b/newlib/libc/ctype/isupper.c
@@ -41,7 +41,7 @@ No supporting OS subroutines are required.
 
 #undef isupper
 int
-_DEFUN(isupper,(c),int c)
+isupper (int c)
 {
 	return ((__CTYPE_PTR[c+1] & (_U|_L)) == _U);
 }
diff --git a/newlib/libc/ctype/iswalnum.c b/newlib/libc/ctype/iswalnum.c
index d9295434d..45273a8b2 100644
--- a/newlib/libc/ctype/iswalnum.c
+++ b/newlib/libc/ctype/iswalnum.c
@@ -37,7 +37,7 @@ No supporting OS subroutines are required.
 #include <wctype.h>
 
 int
-_DEFUN(iswalnum,(c),wint_t c)
+iswalnum (wint_t c)
 {
   return (iswalpha (c) || iswdigit (c));
 }
diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
index 973aa09b4..2906cd12a 100644
--- a/newlib/libc/ctype/iswalpha.c
+++ b/newlib/libc/ctype/iswalpha.c
@@ -74,7 +74,7 @@ No supporting OS subroutines are required.
 #endif /* _MB_CAPABLE */
 
 int
-_DEFUN(iswalpha,(c), wint_t c)
+iswalpha (wint_t c)
 {
 #ifdef _MB_CAPABLE
   unsigned const char *table;
diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
index b83683d94..ef91572cd 100644
--- a/newlib/libc/ctype/iswblank.c
+++ b/newlib/libc/ctype/iswblank.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 int
-_DEFUN(iswblank,(c), wint_t c)
+iswblank (wint_t c)
 {
 #ifdef _MB_CAPABLE
   c = _jp2uc (c);
diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
index c96ed343a..249a0a811 100644
--- a/newlib/libc/ctype/iswcntrl.c
+++ b/newlib/libc/ctype/iswcntrl.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 int
-_DEFUN(iswcntrl,(c), wint_t c)
+iswcntrl (wint_t c)
 {
 #ifdef _MB_CAPABLE
   c = _jp2uc (c);
diff --git a/newlib/libc/ctype/iswctype.c b/newlib/libc/ctype/iswctype.c
index 89c0f9a31..027cb8ae3 100644
--- a/newlib/libc/ctype/iswctype.c
+++ b/newlib/libc/ctype/iswctype.c
@@ -38,7 +38,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 int
-_DEFUN(iswctype,(c, desc), wint_t c, wctype_t desc)
+iswctype (wint_t c, wctype_t desc)
 {
   switch (desc)
     {
diff --git a/newlib/libc/ctype/iswdigit.c b/newlib/libc/ctype/iswdigit.c
index 7926f8dc2..2b2614135 100644
--- a/newlib/libc/ctype/iswdigit.c
+++ b/newlib/libc/ctype/iswdigit.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
 #include <wctype.h>
 
 int
-_DEFUN(iswdigit,(c), wint_t c)
+iswdigit (wint_t c)
 {
   return (c >= (wint_t)'0' && c <= (wint_t)'9');
 }
diff --git a/newlib/libc/ctype/iswgraph.c b/newlib/libc/ctype/iswgraph.c
index 90e1f97fa..e0df4aa3f 100644
--- a/newlib/libc/ctype/iswgraph.c
+++ b/newlib/libc/ctype/iswgraph.c
@@ -65,7 +65,7 @@ No supporting OS subroutines are required.
 #include <wctype.h>
 
 int
-_DEFUN(iswgraph,(c),wint_t c)
+iswgraph (wint_t c)
 {
   return (iswprint (c) && !iswspace (c));
 }
diff --git a/newlib/libc/ctype/iswlower.c b/newlib/libc/ctype/iswlower.c
index 19cfdc420..8b38835f3 100644
--- a/newlib/libc/ctype/iswlower.c
+++ b/newlib/libc/ctype/iswlower.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
 #include <wctype.h>
 
 int
-_DEFUN(iswlower,(c),wint_t c)
+iswlower (wint_t c)
 {
 	return (towupper (c) != c);
 }
diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
index 51a50019b..c6050b502 100644
--- a/newlib/libc/ctype/iswprint.c
+++ b/newlib/libc/ctype/iswprint.c
@@ -73,7 +73,7 @@ No supporting OS subroutines are required.
 #endif /* _MB_CAPABLE */
 
 int
-_DEFUN(iswprint,(c), wint_t c)
+iswprint (wint_t c)
 {
 #ifdef _MB_CAPABLE
   unsigned const char *table;
diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
index b1069a202..8ab703846 100644
--- a/newlib/libc/ctype/iswpunct.c
+++ b/newlib/libc/ctype/iswpunct.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 int
-_DEFUN(iswpunct,(c), wint_t c)
+iswpunct (wint_t c)
 {
   return (!iswalnum (c) && iswgraph (c));
 }
diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
index d6ba3e97d..ae3841aa5 100644
--- a/newlib/libc/ctype/iswspace.c
+++ b/newlib/libc/ctype/iswspace.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 int
-_DEFUN(iswspace,(c), wint_t c)
+iswspace (wint_t c)
 {
 #ifdef _MB_CAPABLE
   c = _jp2uc (c);
diff --git a/newlib/libc/ctype/iswupper.c b/newlib/libc/ctype/iswupper.c
index 49f009346..c4969a3ec 100644
--- a/newlib/libc/ctype/iswupper.c
+++ b/newlib/libc/ctype/iswupper.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
 #include <wctype.h>
 
 int
-_DEFUN(iswupper,(c),wint_t c)
+iswupper (wint_t c)
 {
   return (towlower (c) != c);
 }
diff --git a/newlib/libc/ctype/iswxdigit.c b/newlib/libc/ctype/iswxdigit.c
index 3f47962f1..436718642 100644
--- a/newlib/libc/ctype/iswxdigit.c
+++ b/newlib/libc/ctype/iswxdigit.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
 #include <wctype.h>
 
 int
-_DEFUN(iswxdigit,(c), wint_t c)
+iswxdigit (wint_t c)
 {
   return ((c >= (wint_t)'0' && c <= (wint_t)'9') ||
 	  (c >= (wint_t)'a' && c <= (wint_t)'f') ||
diff --git a/newlib/libc/ctype/isxdigit.c b/newlib/libc/ctype/isxdigit.c
index f5e858c94..2bfe18dbf 100644
--- a/newlib/libc/ctype/isxdigit.c
+++ b/newlib/libc/ctype/isxdigit.c
@@ -44,7 +44,7 @@ No supporting OS subroutines are required.
 
 #undef isxdigit
 int
-_DEFUN(isxdigit,(c),int c)
+isxdigit (int c)
 {
 	return(__CTYPE_PTR[c+1] & ((_X)|(_N)));
 }
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
index 8fbd1b083..29eec0ff5 100644
--- a/newlib/libc/ctype/jp2uc.c
+++ b/newlib/libc/ctype/jp2uc.c
@@ -48,7 +48,7 @@
 #define JP_EUCJP	3
 
 static wint_t
-_DEFUN (__jp2uc, (c, type), wint_t c, int type)
+__jp2uc (wint_t c, int type)
 {
   int index, adj;
   unsigned char byte1, byte2;
@@ -152,7 +152,7 @@ _DEFUN (__jp2uc, (c, type), wint_t c, int type)
 }
 
 wint_t
-_DEFUN (_jp2uc, (c), wint_t c)
+_jp2uc (wint_t c)
 {
   if (!strcmp (__current_locale_charset (), "JIS"))
     c = __jp2uc (c, JP_JIS);
diff --git a/newlib/libc/ctype/toascii.c b/newlib/libc/ctype/toascii.c
index 450e231a3..de5b8e1c3 100644
--- a/newlib/libc/ctype/toascii.c
+++ b/newlib/libc/ctype/toascii.c
@@ -41,7 +41,7 @@ No supporting OS subroutines are required.
 #undef toascii
 
 int
-_DEFUN(toascii,(c),int c)
+toascii (int c)
 {
   return (c)&0177;
 }
diff --git a/newlib/libc/ctype/tolower.c b/newlib/libc/ctype/tolower.c
index 5ebd3cd96..aae2ce09e 100644
--- a/newlib/libc/ctype/tolower.c
+++ b/newlib/libc/ctype/tolower.c
@@ -62,7 +62,7 @@ No supporting OS subroutines are required.
 
 #undef tolower
 int
-_DEFUN(tolower,(c),int c)
+tolower (int c)
 {
 #if defined (_MB_EXTENDED_CHARSETS_ISO) || defined (_MB_EXTENDED_CHARSETS_WINDOWS)
   if ((unsigned char) c <= 0x7f) 
diff --git a/newlib/libc/ctype/toupper.c b/newlib/libc/ctype/toupper.c
index d9089a95b..61951b00b 100644
--- a/newlib/libc/ctype/toupper.c
+++ b/newlib/libc/ctype/toupper.c
@@ -62,7 +62,7 @@ No supporting OS subroutines are required.
 
 #undef toupper
 int
-_DEFUN(toupper,(c),int c)
+toupper (int c)
 {
 #if defined (_MB_EXTENDED_CHARSETS_ISO) || defined (_MB_EXTENDED_CHARSETS_WINDOWS)
   if ((unsigned char) c <= 0x7f)
diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c
index 3500cbaac..edbdfce41 100644
--- a/newlib/libc/ctype/towctrans.c
+++ b/newlib/libc/ctype/towctrans.c
@@ -76,8 +76,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 wint_t
-_DEFUN (_towctrans_r, (r, c, w), 
-	struct _reent *r,
+_towctrans_r (struct _reent *r,
 	wint_t c,
 	wctrans_t w)
 {
@@ -94,8 +93,7 @@ _DEFUN (_towctrans_r, (r, c, w),
 
 #ifndef _REENT_ONLY
 wint_t
-_DEFUN (towctrans, (c, w),
-	wint_t c,
+towctrans (wint_t c,
         wctrans_t w)
 {
   return _towctrans_r (_REENT, c, w);
diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
index 4485fdef4..db390dbdf 100644
--- a/newlib/libc/ctype/towlower.c
+++ b/newlib/libc/ctype/towlower.c
@@ -73,7 +73,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 wint_t
-_DEFUN(towlower,(c), wint_t c)
+towlower (wint_t c)
 {
 #ifdef _MB_CAPABLE
   c = _jp2uc (c);
diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
index 06d12ea99..306f72bd5 100644
--- a/newlib/libc/ctype/towupper.c
+++ b/newlib/libc/ctype/towupper.c
@@ -73,7 +73,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 wint_t
-_DEFUN(towupper,(c), wint_t c)
+towupper (wint_t c)
 {
 #ifdef _MB_CAPABLE
   c = _jp2uc (c);
diff --git a/newlib/libc/ctype/wctrans.c b/newlib/libc/ctype/wctrans.c
index 7183c45ca..4a58df152 100644
--- a/newlib/libc/ctype/wctrans.c
+++ b/newlib/libc/ctype/wctrans.c
@@ -75,8 +75,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 wctrans_t
-_DEFUN (_wctrans_r, (r, c), 
-	struct _reent *r,
+_wctrans_r (struct _reent *r,
 	const char *c)
 {
   if (!strcmp (c, "tolower"))
@@ -92,8 +91,7 @@ _DEFUN (_wctrans_r, (r, c),
 
 #ifndef _REENT_ONLY
 wctrans_t
-_DEFUN (wctrans, (c),
-	const char *c)
+wctrans (const char *c)
 {
   return _wctrans_r (_REENT, c);
 }
diff --git a/newlib/libc/ctype/wctype.c b/newlib/libc/ctype/wctype.c
index 6cd9425bc..5f2ae7a25 100644
--- a/newlib/libc/ctype/wctype.c
+++ b/newlib/libc/ctype/wctype.c
@@ -76,8 +76,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 wctype_t
-_DEFUN (_wctype_r, (r, c), 
-	struct _reent *r,
+_wctype_r (struct _reent *r,
 	const char *c)
 {
   switch (*c)
@@ -135,8 +134,7 @@ _DEFUN (_wctype_r, (r, c),
 
 #ifndef _REENT_ONLY
 wctype_t
-_DEFUN (wctype, (c),
-	const char *c)
+wctype (const char *c)
 {
   return _wctype_r (_REENT, c);
 }
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index fb0a50e90..29d36f941 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -101,8 +101,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
 
 #if defined (ICONV_FROM_UCS_CES_EUC)
 static void *
-_DEFUN(euc_from_ucs_init, (rptr, encoding),
-                          struct _reent *rptr,
+euc_from_ucs_init (struct _reent *rptr,
                           const char *encoding)
 {
   int i;
@@ -165,8 +164,7 @@ error1:
 }
 
 static size_t
-_DEFUN(euc_from_ucs_close, (rptr, data),
-                           struct _reent *rptr,
+euc_from_ucs_close (struct _reent *rptr,
                            void *data)
 {
   int i;
@@ -185,8 +183,7 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
 }
 
 static size_t
-_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                             void *data,
+euc_convert_from_ucs (void *data,
                              register ucs4_t in,
                              unsigned char **outbuf,
                              size_t *outbytesleft)
@@ -261,8 +258,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_EUC)
 static void *
-_DEFUN(euc_to_ucs_init, (rptr, encoding),
-                        struct _reent *rptr,
+euc_to_ucs_init (struct _reent *rptr,
                         const char *encoding)
 {
   int i;
@@ -325,8 +321,7 @@ error1:
 }
 
 static size_t
-_DEFUN(euc_to_ucs_close, (rptr, data),
-                         struct _reent *rptr,
+euc_to_ucs_close (struct _reent *rptr,
                          void *data)
 {
   int i;
@@ -345,8 +340,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
 }
 
 static ucs4_t
-_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
-                           void *data,
+euc_convert_to_ucs (void *data,
                            const unsigned char **inbuf,
                            size_t *inbytesleft)
 {
@@ -432,8 +426,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_EUC */
 
 static int
-_DEFUN(euc_get_mb_cur_max, (data),
-                           void *data)
+euc_get_mb_cur_max (void *data)
 {
   return ((euc_data_t *)data)->mb_cur_max;
 }
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 77b820bae..45cfe6267 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -40,8 +40,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
 static size_t
-_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               void *data,
+table_pcs_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -65,24 +64,21 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
 }
 
 static void *
-_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
-                                struct _reent *rptr,
+table_pcs_from_ucs_init (struct _reent *rptr,
                                 const char *encoding)
 {
   return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
 }
 
 static size_t
-_DEFUN(table_pcs_from_ucs_close, (rptr, data),
-                                 struct _reent *rptr,
+table_pcs_from_ucs_close (struct _reent *rptr,
                                  void *data)
 {
   return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
 }
 
 static int
-_DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
-                                           void *data)
+table_pcs_from_ucs_get_mb_cur_max (void *data)
 {
   return _iconv_from_ucs_ces_handlers_table.get_mb_cur_max (data);
 }
@@ -91,8 +87,7 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
 
 #if defined (ICONV_TO_UCS_CES_TABLE_PCS)
 static ucs4_t
-_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
-                             void *data,
+table_pcs_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -113,24 +108,21 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
 }
 
 static void *
-_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
-                              struct _reent *rptr,
+table_pcs_to_ucs_init (struct _reent *rptr,
                               const char *encoding)
 {
   return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
 }
 
 static size_t
-_DEFUN(table_pcs_to_ucs_close, (rptr, data),
-                               struct _reent *rptr,
+table_pcs_to_ucs_close (struct _reent *rptr,
                                void *data)
 {
   return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
 }
 
 static int
-_DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
-                                         void *data)
+table_pcs_to_ucs_get_mb_cur_max (void *data)
 {
   return _iconv_to_ucs_ces_handlers_table.get_mb_cur_max (data);
 }
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 969c0944b..2b844d558 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -74,8 +74,7 @@ _EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
  * Interface data and functions implementation.
  */
 static size_t
-_DEFUN(table_close, (rptr, data),
-                    struct _reent *rptr,
+table_close (struct _reent *rptr,
                     void *data)
 {
   const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -89,8 +88,7 @@ _DEFUN(table_close, (rptr, data),
 
 #if defined (ICONV_FROM_UCS_CES_TABLE)
 static void *
-_DEFUN(table_init_from_ucs, (rptr, encoding),
-                            struct _reent *rptr,
+table_init_from_ucs (struct _reent *rptr,
                             const char *encoding)
 {
   int i;
@@ -127,8 +125,7 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               void *data,
+table_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -172,8 +169,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_TABLE)
 static void *
-_DEFUN(table_init_to_ucs, (rptr, encoding),
-                          struct _reent *rptr,
+table_init_to_ucs (struct _reent *rptr,
                           const char *encoding)
 {
   int i;
@@ -210,8 +206,7 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
 }
 
 static ucs4_t
-_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
-                             void *data,
+table_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -253,8 +248,7 @@ _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_TABLE */
 
 static int
-_DEFUN(table_get_mb_cur_max, (data),
-                             void *data)
+table_get_mb_cur_max (void *data)
 {
   return ((iconv_ccs_desc_t *)data)->bits/8;
 }
@@ -303,8 +297,7 @@ _iconv_from_ucs_ces_handlers_table =
  *     Code that corresponds to 'code'.
  */
 static __inline ucs2_t
-_DEFUN(find_code_speed, (code, tblp),
-                        ucs2_t code,
+find_code_speed (ucs2_t code,
                         const __uint16_t *tblp)
 {
   int idx = tblp[code >> 8];
@@ -326,8 +319,7 @@ _DEFUN(find_code_speed, (code, tblp),
  *     Code that corresponds to 'code'.
  */
 static __inline ucs2_t
-_DEFUN(find_code_speed_8bit, (code, tblp),
-                             ucs2_t code,
+find_code_speed_8bit (ucs2_t code,
                              const unsigned char *tblp)
 {
   int idx;
@@ -366,8 +358,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
  *     Code that corresponds to 'code'.
  */
 static ucs2_t
-_DEFUN(find_code_size, (code, tblp),
-                       ucs2_t code,
+find_code_size (ucs2_t code,
                        const __uint16_t *tblp)
 {
   int first, last, cur, center;
@@ -460,8 +451,7 @@ _DEFUN(find_code_size, (code, tblp),
  *    iconv_ccs_desc_t * pointer is success, NULL if failure.
  */
 static const iconv_ccs_desc_t *
-_DEFUN(load_file, (rptr, name, direction), 
-                  struct _reent *rptr,
+load_file (struct _reent *rptr,
                   const char *name,
                   int direction)
 {
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 2c9169473..3473444cf 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -44,8 +44,7 @@
  
 #if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
 static size_t
-_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        void *data,
+ucs_2_internal_convert_from_ucs (void *data,
                                         register ucs4_t in,
                                         unsigned char **outbuf,
                                         size_t *outbytesleft)
@@ -66,8 +65,7 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
 static ucs4_t
-_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
-                                      void *data,
+ucs_2_internal_convert_to_ucs (void *data,
                                       const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
@@ -89,8 +87,7 @@ _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_2_INTERNAL */
 
 static int
-_DEFUN(ucs_2_internal_get_mb_cur_max, (data),
-                                      void *data)
+ucs_2_internal_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index a99562eec..5e965b080 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -50,8 +50,7 @@
 #define UCS_2LE "ucs_2le"
 
 static void *
-_DEFUN(ucs_2_init, (rptr, encoding),
-                   struct _reent *rptr,
+ucs_2_init (struct _reent *rptr,
                    const char *encoding)
 {
   int *data;
@@ -68,8 +67,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(ucs_2_close, (rptr, data),
-                    struct _reent *rptr,
+ucs_2_close (struct _reent *rptr,
                     void *data)
 {
   _free_r (rptr, data);
@@ -78,8 +76,7 @@ _DEFUN(ucs_2_close, (rptr, data),
 
 #if defined (ICONV_FROM_UCS_CES_UCS_2)
 static size_t
-_DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               void *data,
+ucs_2_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -105,8 +102,7 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UCS_2)
 static ucs4_t
-_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
-                             void *data,
+ucs_2_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -132,8 +128,7 @@ _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_2 */
 
 static int
-_DEFUN(ucs_2_get_mb_cur_max, (data),
-                             void *data)
+ucs_2_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index a5c6d7e09..d10952c55 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -44,8 +44,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
 static size_t
-_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        void *data,
+ucs_4_internal_convert_from_ucs (void *data,
                                         register ucs4_t in,
                                         unsigned char **outbuf,
                                         size_t *outbytesleft)
@@ -66,8 +65,7 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
 static ucs4_t
-_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
-                                      void *data,
+ucs_4_internal_convert_to_ucs (void *data,
                                       const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
@@ -89,8 +87,7 @@ _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_4_INTERNAL */
 
 static int
-_DEFUN(ucs_4_internal_get_mb_cur_max, (data),
-                                      void *data)
+ucs_4_internal_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 0009981fe..290cc71f8 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -51,8 +51,7 @@
 #define UCS_4LE "ucs_4le"
 
 static void *
-_DEFUN(ucs_4_init, (rptr, encoding),
-                   struct _reent *rptr,
+ucs_4_init (struct _reent *rptr,
                    const char *encoding)
 {
   int *data;
@@ -69,8 +68,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(ucs_4_close, (rptr, data),
-                    struct _reent *rptr,
+ucs_4_close (struct _reent *rptr,
                     void *data)
 {
   _free_r(rptr, data);
@@ -80,8 +78,7 @@ _DEFUN(ucs_4_close, (rptr, data),
 
 #if defined (ICONV_FROM_UCS_CES_UCS_4)
 static size_t
-_DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               void *data,
+ucs_4_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -107,8 +104,7 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UCS_4)
 static ucs4_t
-_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
-                             void *data,
+ucs_4_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -134,8 +130,7 @@ _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_4 */
 
 static int
-_DEFUN(ucs_4_get_mb_cur_max, (data),
-                             void *data)
+ucs_4_get_mb_cur_max (void *data)
 {
   return 4;
 }
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index e6a665070..164679178 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -40,8 +40,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_US_ASCII)
 static size_t
-_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                  void *data,
+us_ascii_convert_from_ucs (void *data,
                                   ucs4_t in,
                                   unsigned char **outbuf,
                                   size_t *outbytesleft)
@@ -60,8 +59,7 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_US_ASCII)
 static ucs4_t
-_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
-                                void *data,
+us_ascii_convert_to_ucs (void *data,
                                 const unsigned char **inbuf,
                                 size_t *inbytesleft)
 {
@@ -83,8 +81,7 @@ _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_US_ASCII */
 
 static int
-_DEFUN(us_ascii_get_mb_cur_max, (data),
-                                void *data)
+us_ascii_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index dd62a5dea..a3491bb3c 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -58,8 +58,7 @@
 #define UTF_16LE "utf_16le"
 
 static size_t
-_DEFUN(utf_16_close, (rptr, data),
-                     struct _reent *rptr,
+utf_16_close (struct _reent *rptr,
                      void *data)
 {
   _free_r(rptr, data);
@@ -68,8 +67,7 @@ _DEFUN(utf_16_close, (rptr, data),
 
 #if defined (ICONV_FROM_UCS_CES_UTF_16)
 static void *
-_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
-                             struct _reent *rptr,
+utf_16_init_from_ucs (struct _reent *rptr,
                              const char *encoding)
 {
   int *data;
@@ -88,8 +86,7 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                void *data,
+utf_16_convert_from_ucs (void *data,
                                 register ucs4_t in,
                                 unsigned char **outbuf,
                                 size_t *outbytesleft)
@@ -170,8 +167,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UTF_16)
 static void *
-_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
-                           struct _reent *rptr,
+utf_16_init_to_ucs (struct _reent *rptr,
                            const char *encoding)
 {
   int *data;
@@ -190,8 +186,7 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
 }
 
 static ucs4_t
-_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
-                              void *data,
+utf_16_convert_to_ucs (void *data,
                               const unsigned char **inbuf,
                               size_t *inbytesleft)
 {
@@ -268,8 +263,7 @@ _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UTF_16 */
 
 static int
-_DEFUN(utf_16_get_mb_cur_max, (data),
-                              void *data)
+utf_16_get_mb_cur_max (void *data)
 {
   return 6;
 }
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index 5559272d7..116f25925 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -43,8 +43,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_UTF_8)
 static size_t
-_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
-                         void *data,
+convert_from_ucs (void *data,
                          register ucs4_t in,
                          unsigned char **outbuf,
                          size_t *outbytesleft)
@@ -125,8 +124,7 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UTF_8)
 static ucs4_t
-_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
-                       void *data,
+convert_to_ucs (void *data,
                        const unsigned char **inbuf,
                        size_t *inbytesleft)
 {
@@ -259,8 +257,7 @@ _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UTF_8 */
 
 static int
-_DEFUN(get_mb_cur_max, (data),
-                       void *data)
+get_mb_cur_max (void *data)
 {
   return UTF8_MB_CUR_MAX;
 }
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 7c932e65c..d04cebb57 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -48,8 +48,7 @@
  *   Returns canonical form of 'str' if success, NULL if failure.
  */
 static const char *
-_DEFUN(canonical_form, (rptr, str), 
-                       struct _reent *rptr,
+canonical_form (struct _reent *rptr,
                        const char *str)
 {
   char *p, *p1;
@@ -93,8 +92,7 @@ _DEFUN(canonical_form, (rptr, str),
  *   and sets current thread's/process's errno.
  */
 static char *
-_DEFUN(find_alias, (rptr, alias, table, len),
-                   struct _reent *rptr,
+find_alias (struct _reent *rptr,
                    const char *alias,
                    const char *table,
                    int len)
@@ -147,8 +145,7 @@ search_again:
  *   and sets current thread's/process's errno.
  */
 char *
-_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path), 
-                                     struct _reent *rptr,
+_iconv_resolve_encoding_name (struct _reent *rptr,
                                      const char *ca)
 {
   char *p = (char *)ca;
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 0cf3cf5ff..02c749d7f 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -120,8 +120,7 @@ No supporting OS subroutine calls are required.
  */
 
 iconv_t
-_DEFUN(iconv_open, (to, from), 
-                   const char *to,
+iconv_open (const char *to,
                    const char *from)
 {
   return _iconv_open_r (_REENT, to, from);
@@ -129,8 +128,7 @@ _DEFUN(iconv_open, (to, from),
 
 
 size_t
-_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
-              iconv_t cd,
+iconv (iconv_t cd,
               char **__restrict inbuf,
               size_t *__restrict inbytesleft,
               char **__restrict outbuf,
@@ -142,7 +140,7 @@ _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
 
 int
-_DEFUN(iconv_close, (cd), iconv_t cd)
+iconv_close (iconv_t cd)
 {
     return _iconv_close_r (_REENT, cd);
 }
@@ -150,8 +148,7 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
 
 #ifndef _REENT_ONLY
 iconv_t
-_DEFUN(_iconv_open_r, (rptr, to, from),
-                      struct _reent *rptr,
+_iconv_open_r (struct _reent *rptr,
                       const char *to,
                       const char *from)
 {
@@ -201,8 +198,7 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
 
 
 size_t
-_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                 struct _reent *rptr,
+_iconv_r (struct _reent *rptr,
                  iconv_t cd,
                  const char **inbuf,
                  size_t *inbytesleft,
@@ -288,8 +284,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
 
 int
-_DEFUN(_iconv_close_r, (rptr, cd),
-                       struct _reent *rptr,
+_iconv_close_r (struct _reent *rptr,
                        iconv_t cd)
 {
   int res;
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index dfb6a18dd..ed8f3a7ba 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -59,8 +59,7 @@
  *   and sets current thread's/process's errno.
  */
 const char *
-_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
-                                      struct _reent *rptr,
+_iconv_nls_construct_filename (struct _reent *rptr,
                                       const char *file,
                                       const char *dir,
                                       const char *ext)
@@ -114,8 +113,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
  *    "to" encoding's value if 'direction' isn't 0.
  */
 int
-_DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
-                                  iconv_t cd,
+_iconv_nls_get_mb_cur_max (iconv_t cd,
                                   int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -137,8 +135,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
 
  */
 int
-_DEFUN(_iconv_nls_is_stateful, (cd, direction),
-                               iconv_t cd,
+_iconv_nls_is_stateful (iconv_t cd,
                                int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -166,8 +163,7 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
  *    Same as _iconv_r.
  */
 size_t
-_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                        struct _reent *rptr,
+_iconv_nls_conv (struct _reent *rptr,
                         iconv_t cd,
                         const char **inbuf,
                         size_t *inbytesleft,
@@ -220,8 +216,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
  *    if 'direction' isn't 0.
  */
 void
-_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
-                             iconv_t cd,
+_iconv_nls_get_state (iconv_t cd,
                              mbstate_t *ps,
                              int direction)
 {
@@ -247,8 +242,7 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
  *    0 if success, -1 if failure.
  */
 int
-_DEFUN(_iconv_nls_set_state, (cd, ps, direction),
-                             iconv_t cd,
+_iconv_nls_set_state (iconv_t cd,
                              mbstate_t *ps,
                              int direction)
 {
@@ -259,8 +253,7 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
 
 /* Same as iconv_open() but don't perform name resolving */
 static iconv_t
-_DEFUN(iconv_open1, (rptr, to, from),
-                     struct _reent *rptr,
+iconv_open1 (struct _reent *rptr,
                      const char *to,
                      const char *from)
 {
@@ -316,8 +309,7 @@ _DEFUN(iconv_open1, (rptr, to, from),
  *     If successful - return 0, else set errno and return -1.
  */
 int
-_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
-                        struct _reent *rptr,
+_iconv_nls_open (struct _reent *rptr,
                         const char *encoding,
                         iconv_t *tomb,
                         iconv_t *towc,
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 8040c24e7..e75d83376 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -36,8 +36,7 @@ static int null_conversion_dummy_data;
 
 
 static void *
-_DEFUN(null_conversion_open, (rptr, to, from),
-                             struct _reent *rptr,
+null_conversion_open (struct _reent *rptr,
                              const char *to,
                              const char *from)
 {
@@ -46,8 +45,7 @@ _DEFUN(null_conversion_open, (rptr, to, from),
 
 
 static size_t
-_DEFUN(null_conversion_close, (rptr, data),
-                              struct _reent *rptr,
+null_conversion_close (struct _reent *rptr,
                               void *data)
 {
   return 0;
@@ -55,9 +53,7 @@ _DEFUN(null_conversion_close, (rptr, data),
 
 
 static size_t
-_DEFUN(null_conversion_convert,
-                     (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
-                     struct _reent *rptr,
+null_conversion_convert (struct _reent *rptr,
                      void *data,
                      const unsigned char **inbuf,
                      size_t *inbytesleft,
@@ -93,8 +89,7 @@ _DEFUN(null_conversion_convert,
 
 
 static int
-_DEFUN(null_conversion_get_mb_cur_max, (data, direction),
-                                       void *data,
+null_conversion_get_mb_cur_max (void *data,
                                        int direction)
 {
   return ICONV_MB_LEN_MAX;
@@ -102,8 +97,7 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
 
 
 static void
-_DEFUN(null_conversion_get_state, (data, state, size),
-                                  void *data,
+null_conversion_get_state (void *data,
                                   mbstate_t *state,
                                   int direction)
 {
@@ -112,8 +106,7 @@ _DEFUN(null_conversion_get_state, (data, state, size),
 
 
 static int
-_DEFUN(null_conversion_set_state, (data, state, direction),
-                                  void *data,
+null_conversion_set_state (void *data,
                                   mbstate_t *state,
                                   int direction)
 {
@@ -121,8 +114,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
 }
 
 static int
-_DEFUN(null_conversion_is_stateful, (data, direction),
-                                    void *data,
+null_conversion_is_stateful (void *data,
                                     int direction)
 {
   return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index f480aee63..8c3d19073 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -45,8 +45,7 @@ _EXFUN(find_encoding_name, (const char *searchee,
  */
 
 static void *
-_DEFUN(ucs_based_conversion_open, (rptr, to, from),
-                                  struct _reent *rptr,
+ucs_based_conversion_open (struct _reent *rptr,
                                   const char *to,
                                   const char *from)
 {
@@ -123,8 +122,7 @@ error:
 
 
 static size_t
-_DEFUN(ucs_based_conversion_close, (rptr, data),
-                                   struct _reent *rptr,
+ucs_based_conversion_close (struct _reent *rptr,
                                    void *data)
 {
   iconv_ucs_conversion_t *uc;
@@ -144,9 +142,7 @@ _DEFUN(ucs_based_conversion_close, (rptr, data),
 
 
 static size_t
-_DEFUN(ucs_based_conversion_convert,
-                 (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
-                 struct _reent *rptr,
+ucs_based_conversion_convert (struct _reent *rptr,
                  void *data,
                  const unsigned char **inbuf,
                  size_t *inbytesleft,
@@ -238,8 +234,7 @@ _DEFUN(ucs_based_conversion_convert,
 
 
 static int
-_DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
-                                            void *data,
+ucs_based_conversion_get_mb_cur_max (void *data,
                                             int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -252,8 +247,7 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
 
 
 static void
-_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
-                                       void *data,
+ucs_based_conversion_get_state (void *data,
                                        mbstate_t *state,
                                        int direction)
 {
@@ -280,8 +274,7 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
 
 
 static int
-_DEFUN(ucs_based_conversion_set_state, (data, state, direction),
-                                       void *data,
+ucs_based_conversion_set_state (void *data,
                                        mbstate_t *state,
                                        int direction)
 {
@@ -302,8 +295,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
 }
 
 static int
-_DEFUN(ucs_based_conversion_is_stateful, (data, direction),
-                                         void *data,
+ucs_based_conversion_is_stateful (void *data,
                                          int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -342,8 +334,7 @@ _iconv_ucs_conversion_handlers =
  */
 
 static int
-_DEFUN(find_encoding_name, (searchee, names),
-                           const char *searchee,
+find_encoding_name (const char *searchee,
                            const char **names)
 {
   const char *p;
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index d05145b91..951617520 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -58,14 +58,12 @@
 #define _EXPARM(name, proto)		(* name) proto
 #define _EXFNPTR(name, proto)		(* name) proto
 #endif
-#define	_DEFUN(name, arglist, args)	name(args)
 #ifndef _LONG_DOUBLE
 #define _LONG_DOUBLE long double
 #endif
 #else	
 #define	_EXFUN(name, proto)		name()
 #define	_EXFUN_NOTHROW(name, proto)	name()
-#define	_DEFUN(name, arglist, args)	name arglist args;
 #define _LONG_DOUBLE double
 #endif
 
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 7080b0510..baa5451a6 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -289,8 +289,7 @@ static char *currentlocale (void);
 #endif /* _MB_CAPABLE */
 
 char *
-_DEFUN(_setlocale_r, (p, category, locale),
-       struct _reent *p,
+_setlocale_r (struct _reent *p,
        int category,
        const char *locale)
 {
@@ -990,8 +989,7 @@ __locale_ctype_ptr (void)
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN (setlocale, (category, locale),
-	int category,
+setlocale (int category,
 	const char *locale)
 {
   return _setlocale_r (_REENT, category, locale);
diff --git a/newlib/libc/locale/localeconv.c b/newlib/libc/locale/localeconv.c
index b87f604a3..5f34a785f 100644
--- a/newlib/libc/locale/localeconv.c
+++ b/newlib/libc/locale/localeconv.c
@@ -51,8 +51,7 @@ __localeconv_l (struct __locale_t *locale)
 }
 
 struct lconv *
-_DEFUN (_localeconv_r, (data), 
-	struct _reent *data)
+_localeconv_r (struct _reent *data)
 {
   /* Note that we always fall back to the global locale, even in case
      of specifying a reent.  Otherwise a call to _localeconv_r would just
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index 82987eade..434195e2c 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -81,8 +81,7 @@ QUICKREF
 #endif
 
 int
-_DEFUN (strcmp, (s1, s2),
-	const char *s1,
+strcmp (const char *s1,
 	const char *s2)
 { 
 
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index 8e2dae634..62072fa28 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -81,8 +81,7 @@ QUICKREF
 #endif
 
 char*
-_DEFUN (strcpy, (dst0, src0),
-	char *__restrict dst0,
+strcpy (char *__restrict dst0,
 	const char *__restrict src0)
 {
 
diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
index 059f4463d..acb4464bc 100644
--- a/newlib/libc/machine/microblaze/strlen.c
+++ b/newlib/libc/machine/microblaze/strlen.c
@@ -78,8 +78,7 @@ QUICKREF
 #endif
 
 size_t
-_DEFUN (strlen, (str),
-	const char *str)
+strlen (const char *str)
 {
 
 #ifndef HAVE_HW_PCMP
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index dd5e2dfd4..b069d71d1 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -62,8 +62,7 @@ PORTABILITY
 #include <_ansi.h>
 
 __int16_t
-_DEFUN (_atosfix16_r, (reent, s),
-	struct _reent *reent,
+_atosfix16_r (struct _reent *reent,
 	const char *s)
 {
   return _strtosfix16_r (reent, s, NULL);
@@ -71,8 +70,7 @@ _DEFUN (_atosfix16_r, (reent, s),
 
 #ifndef _REENT_ONLY
 __int16_t
-_DEFUN (atosfix16, (s),
-	const char *s)
+atosfix16 (const char *s)
 {
   return strtosfix16 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index fed308b65..e1915b25a 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -8,8 +8,7 @@
 #include <_ansi.h>
 
 __int32_t
-_DEFUN (_atosfix32_r, (reent, s),
-	struct _reent *reent,
+_atosfix32_r (struct _reent *reent,
 	const char *s)
 {
   return _strtosfix32_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atosfix32_r, (reent, s),
 
 #ifndef _REENT_ONLY
 __int32_t
-_DEFUN (atosfix32, (s),
-	const char *s)
+atosfix32 (const char *s)
 {
   return strtosfix32 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index cfc421a3a..5340b1ee2 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -8,8 +8,7 @@
 #include <_ansi.h>
 
 __int64_t
-_DEFUN (_atosfix64_r, (reent, s),
-	struct _reent *reent,
+_atosfix64_r (struct _reent *reent,
 	const char *s)
 {
   return _strtosfix64_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atosfix64_r, (reent, s),
 
 #ifndef _REENT_ONLY
 __int64_t
-_DEFUN (atosfix64, (s),
-	const char *s)
+atosfix64 (const char *s)
 {
   return strtosfix64 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 84a60b252..4cc833862 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -62,8 +62,7 @@ PORTABILITY
 #include <_ansi.h>
 
 __uint16_t
-_DEFUN (_atoufix16_r, (reent, s),
-	struct _reent *reent,
+_atoufix16_r (struct _reent *reent,
 	const char *s)
 {
   return _strtoufix16_r (reent, s, NULL);
@@ -71,8 +70,7 @@ _DEFUN (_atoufix16_r, (reent, s),
 
 #ifndef _REENT_ONLY
 __uint16_t
-_DEFUN (atoufix16, (s),
-	const char *s)
+atoufix16 (const char *s)
 {
   return strtoufix16 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index fc64c75e4..aa2333af6 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -8,8 +8,7 @@
 #include <_ansi.h>
 
 __uint32_t
-_DEFUN (_atoufix32_r, (reent, s),
-	struct _reent *reent,
+_atoufix32_r (struct _reent *reent,
 	const char *s)
 {
   return _strtoufix32_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atoufix32_r, (reent, s),
 
 #ifndef _REENT_ONLY
 __uint32_t
-_DEFUN (atoufix32, (s),
-	const char *s)
+atoufix32 (const char *s)
 {
   return strtoufix32 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index e8ff7773d..cf9517e95 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -8,8 +8,7 @@
 #include <_ansi.h>
 
 __uint64_t
-_DEFUN (_atoufix64_r, (reent, s),
-	struct _reent *reent,
+_atoufix64_r (struct _reent *reent,
 	const char *s)
 {
   return _strtoufix64_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atoufix64_r, (reent, s),
 
 #ifndef _REENT_ONLY
 __uint64_t
-_DEFUN (atoufix64, (s),
-	const char *s)
+atoufix64 (const char *s)
 {
   return strtoufix64 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index 4e998db03..3fba45409 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -92,8 +92,7 @@ PORTABILITY
  * Ignores `locale' stuff.
  */
 __int16_t
-_DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
-	struct _reent *rptr,
+_strtosfix16_r (struct _reent *rptr,
 	const char *nptr,
 	char **endptr)
 {
@@ -169,8 +168,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
 #ifndef _REENT_ONLY
 
 __int16_t
-_DEFUN (strtosfix16, (s, ptr, base),
-	const char *s,
+strtosfix16 (const char *s,
 	char **ptr)
 {
   return _strtosfix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
index e8966808e..b21de9ea1 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -13,8 +13,7 @@
  * Ignores `locale' stuff.
  */
 __int32_t
-_DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
-	struct _reent *rptr,
+_strtosfix32_r (struct _reent *rptr,
 	const char *nptr,
 	char **endptr)
 {
@@ -92,8 +91,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
 #ifndef _REENT_ONLY
 
 __int32_t
-_DEFUN (strtosfix32, (s, ptr, base),
-	const char *s,
+strtosfix32 (const char *s,
 	char **ptr)
 {
   return _strtosfix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
index f7344fc22..16032128f 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -13,8 +13,7 @@
  * Ignores `locale' stuff.
  */
 __int64_t
-_DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
-	struct _reent *rptr,
+_strtosfix64_r (struct _reent *rptr,
 	const char *nptr,
 	char **endptr)
 {
@@ -105,8 +104,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
 #ifndef _REENT_ONLY
 
 __int64_t
-_DEFUN (strtosfix64, (s, ptr, base),
-	const char *s,
+strtosfix64 (const char *s,
 	char **ptr)
 {
   return _strtosfix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
index 0757930d4..9b16268bb 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -91,8 +91,7 @@ PORTABILITY
  * Ignores `locale' stuff.
  */
 __uint16_t
-_DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
-	struct _reent *rptr,
+_strtoufix16_r (struct _reent *rptr,
 	const char *nptr,
 	char **endptr)
 {
@@ -160,8 +159,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
 #ifndef _REENT_ONLY
 
 __uint16_t
-_DEFUN (strtoufix16, (s, ptr, base),
-	const char *s,
+strtoufix16 (const char *s,
 	char **ptr)
 {
   return _strtoufix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
index 60f278daa..7d03f8c9b 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -13,8 +13,7 @@
  * Ignores `locale' stuff.
  */
 __uint32_t
-_DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
-	struct _reent *rptr,
+_strtoufix32_r (struct _reent *rptr,
 	const char *nptr,
 	char **endptr)
 {
@@ -89,8 +88,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
 #ifndef _REENT_ONLY
 
 __uint32_t
-_DEFUN (strtoufix32, (s, ptr, base),
-	const char *s,
+strtoufix32 (const char *s,
 	char **ptr)
 {
   return _strtoufix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
index 509f51318..a2f0484b3 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -13,8 +13,7 @@
  * Ignores `locale' stuff.
  */
 __uint64_t
-_DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
-	struct _reent *rptr,
+_strtoufix64_r (struct _reent *rptr,
 	const char *nptr,
 	char **endptr)
 {
@@ -104,8 +103,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
 #ifndef _REENT_ONLY
 
 __uint64_t
-_DEFUN (strtoufix64, (s, ptr, base),
-	const char *s,
+strtoufix64 (const char *s,
 	char **ptr)
 {
   return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/ufix64toa.c b/newlib/libc/machine/powerpc/ufix64toa.c
index bf13894e6..c829b9b33 100644
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ b/newlib/libc/machine/powerpc/ufix64toa.c
@@ -25,8 +25,7 @@ extern char *_simdldtoa_r (struct _reent *, LONG_DOUBLE_UNION *, int,
  */
 
 char *
-_DEFUN (_ufix64toa_r, (rptr, value, mode, ndigits, decpt, sign, rve),
-	struct _reent *rptr,
+_ufix64toa_r (struct _reent *rptr,
 	__uint64_t value,
 	int mode,
 	int ndigits,
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
index cc156bc76..7a90d571c 100644
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ b/newlib/libc/machine/powerpc/vec_calloc.c
@@ -44,8 +44,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (vec_calloc, (n, size),
-	size_t n,
+vec_calloc (size_t n,
 	size_t size)
 {
   return _vec_calloc_r (_REENT, n, size);
diff --git a/newlib/libc/machine/powerpc/vec_free.c b/newlib/libc/machine/powerpc/vec_free.c
index fa2ea9686..c893e5ab4 100644
--- a/newlib/libc/machine/powerpc/vec_free.c
+++ b/newlib/libc/machine/powerpc/vec_free.c
@@ -6,8 +6,7 @@
 #ifndef _REENT_ONLY
 
 void
-_DEFUN (vec_free, (aptr),
-        void *aptr)
+vec_free (void *aptr)
 {
   _free_r (_REENT, aptr);
 }
diff --git a/newlib/libc/machine/powerpc/vec_malloc.c b/newlib/libc/machine/powerpc/vec_malloc.c
index ad62b119f..b62fe0762 100644
--- a/newlib/libc/machine/powerpc/vec_malloc.c
+++ b/newlib/libc/machine/powerpc/vec_malloc.c
@@ -96,8 +96,7 @@ Supporting OS subroutines required: <<sbrk>>.  */
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (vec_malloc, (nbytes),
-	size_t nbytes)		/* get a block */
+vec_malloc (size_t nbytes)		/* get a block */
 {
   return _memalign_r (_REENT, 16, nbytes);
 }
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
index 05ee82be1..db6f32060 100644
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ b/newlib/libc/machine/powerpc/vec_realloc.c
@@ -7,8 +7,7 @@
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (vec_realloc, (ap, nbytes),
-	void *ap,
+vec_realloc (void *ap,
 	size_t nbytes)
 {
   return _vec_realloc_r (_REENT, ap, nbytes);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 1615d4b25..2cae2aaa1 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -271,8 +271,7 @@ static char *cvt_ufix64 (struct _reent *, unsigned long long, int,  int *, int *
 #define FIXEDPOINT	0x400		/* fixed-point */
 
 int 
-_DEFUN (VFPRINTF, (fp, fmt0, ap),
-	FILE * fp,
+VFPRINTF (FILE * fp,
 	const char *fmt0,
 	va_list ap)
 {
@@ -281,8 +280,7 @@ _DEFUN (VFPRINTF, (fp, fmt0, ap),
 }
 
 int 
-_DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
-	struct _reent *data,
+_VFPRINTF_R (struct _reent *data,
 	FILE * fp,
 	const char *fmt0,
 	va_list ap)
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index 4a3e48c22..f0443bf4a 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -182,8 +182,7 @@ typedef union
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vfscanf, (fp, fmt, ap), 
-    register FILE *__restrict fp,
+vfscanf (register FILE *__restrict fp,
     const char *__restrict fmt,
     va_list ap)
 {
@@ -203,8 +202,7 @@ __svfscanf (fp, fmt0, ap)
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN (_vfscanf_r, (data, fp, fmt, ap),
-    struct _reent *data,
+_vfscanf_r (struct _reent *data,
     register FILE *__restrict fp,
     const char *__restrict fmt,
     va_list ap)
diff --git a/newlib/libc/machine/spu/assert.c b/newlib/libc/machine/spu/assert.c
index e8028459c..90e94eb5d 100644
--- a/newlib/libc/machine/spu/assert.c
+++ b/newlib/libc/machine/spu/assert.c
@@ -10,8 +10,7 @@
 
 /* func can be NULL, in which case no function information is given.  */
 void
-_DEFUN (__assert_func, (file, line, func, failedexpr),
-	const char *file,
+__assert_func (const char *file,
 	int line,
 	const char *func,
 	const char *failedexpr)
@@ -31,8 +30,7 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
 }
 
 void
-_DEFUN (__assert, (file, line, failedexpr),
-	const char *file,
+__assert (const char *file,
 	int line,
 	const char *failedexpr)
 {
diff --git a/newlib/libc/machine/spu/clearerr.c b/newlib/libc/machine/spu/clearerr.c
index 667667a91..27f726a64 100644
--- a/newlib/libc/machine/spu/clearerr.c
+++ b/newlib/libc/machine/spu/clearerr.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 void
-_DEFUN (clearerr, (fp),
-	FILE * fp)
+clearerr (FILE * fp)
 
 {
   int ret;
diff --git a/newlib/libc/machine/spu/creat.c b/newlib/libc/machine/spu/creat.c
index 0e271c1a7..5b8c603f5 100644
--- a/newlib/libc/machine/spu/creat.c
+++ b/newlib/libc/machine/spu/creat.c
@@ -7,8 +7,7 @@
 #include <fcntl.h>
 
 int
-_DEFUN(creat, (path, mode),
-       const char *path,
+creat (const char *path,
        mode_t mode)
 {
   return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/machine/spu/fclose.c b/newlib/libc/machine/spu/fclose.c
index 4e1b8253b..6a3e5073f 100644
--- a/newlib/libc/machine/spu/fclose.c
+++ b/newlib/libc/machine/spu/fclose.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 #ifndef _REENT_ONLY
 int
-_DEFUN (fclose, (fp),
-	FILE * fp)
+fclose (FILE * fp)
 {
   int ret;
 
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index edec03cff..6244e50df 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -34,8 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef _REENT_ONLY
 /* Just a stub for now.  */
 FILE *
-_DEFUN (fdopen, (fd, mode),
-        int fd,
+fdopen (int fd,
         const char *mode)
 {
   errno = ENOSYS;
diff --git a/newlib/libc/machine/spu/feof.c b/newlib/libc/machine/spu/feof.c
index 25e3a8f82..8e874148f 100644
--- a/newlib/libc/machine/spu/feof.c
+++ b/newlib/libc/machine/spu/feof.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (feof, (fp),
-	FILE * fp)
+feof (FILE * fp)
 {
   int result;
 
diff --git a/newlib/libc/machine/spu/ferror.c b/newlib/libc/machine/spu/ferror.c
index ac747eff4..be7970fb6 100644
--- a/newlib/libc/machine/spu/ferror.c
+++ b/newlib/libc/machine/spu/ferror.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (ferror, (fp),
-	FILE * fp)
+ferror (FILE * fp)
 {
   int result;
 
diff --git a/newlib/libc/machine/spu/fflush.c b/newlib/libc/machine/spu/fflush.c
index 7037f4990..6b45ac4a1 100644
--- a/newlib/libc/machine/spu/fflush.c
+++ b/newlib/libc/machine/spu/fflush.c
@@ -36,8 +36,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 #ifndef _REENT_ONLY
 int
-_DEFUN (fflush, (fp),
-	FILE * fp)
+fflush (FILE * fp)
 {
   int result;
 
diff --git a/newlib/libc/machine/spu/fgetc.c b/newlib/libc/machine/spu/fgetc.c
index 815203228..8e191cfcb 100644
--- a/newlib/libc/machine/spu/fgetc.c
+++ b/newlib/libc/machine/spu/fgetc.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fgetc, (fp),
-	FILE * fp)
+fgetc (FILE * fp)
 {
   int result;
 
diff --git a/newlib/libc/machine/spu/fgetpos.c b/newlib/libc/machine/spu/fgetpos.c
index bb7d780ea..68d41ac0e 100644
--- a/newlib/libc/machine/spu/fgetpos.c
+++ b/newlib/libc/machine/spu/fgetpos.c
@@ -44,8 +44,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fgetpos, (fp, pos),
-	FILE *__restrict fp,
+fgetpos (FILE *__restrict fp,
 	_fpos_t *__restrict pos)
 {
   c99_fgetpos_t arg;
diff --git a/newlib/libc/machine/spu/fgets.c b/newlib/libc/machine/spu/fgets.c
index 8f2a9785f..cde29da34 100644
--- a/newlib/libc/machine/spu/fgets.c
+++ b/newlib/libc/machine/spu/fgets.c
@@ -46,8 +46,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN (fgets, (buf, n, fp),
-	char *__restrict buf,
+fgets (char *__restrict buf,
 	int n,
 	FILE *__restrict fp)
 {
diff --git a/newlib/libc/machine/spu/fileno.c b/newlib/libc/machine/spu/fileno.c
index 867a6b8f3..cbf9e50c4 100644
--- a/newlib/libc/machine/spu/fileno.c
+++ b/newlib/libc/machine/spu/fileno.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fileno, (fp),
-	FILE *fp)
+fileno (FILE *fp)
 
 {
   int ret;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index ffa8f6904..13ecdad1e 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -45,8 +45,7 @@ typedef struct
 
 #ifndef _REENT_ONLY
 FILE *
-_DEFUN (fopen, (file, mode),
-	const char *__restrict file,
+fopen (const char *__restrict file,
 	const char *__restrict mode)
 {
   int ret;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 82b72e060..898418606 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -46,8 +46,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fputs, (s, fp),
-	char const *__restrict s,
+fputs (char const *__restrict s,
 	FILE *__restrict fp)
 {
   c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/fread.c b/newlib/libc/machine/spu/fread.c
index 8a6e9c417..12b6bb782 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -49,8 +49,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 size_t
-_DEFUN (fread, (buf, size, count, fp),
-	void *__restrict  buf,
+fread (void *__restrict  buf,
 	size_t size,
 	size_t count,
 	FILE *__restrict fp)
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 0e3f15f83..8babcfe27 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -47,8 +47,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN (freopen, (file, mode, fp),
-	const char *__restrict file,
+freopen (const char *__restrict file,
 	const char *__restrict mode,
 	FILE *__restrict fp)
 {
diff --git a/newlib/libc/machine/spu/fseek.c b/newlib/libc/machine/spu/fseek.c
index 136d5c639..df33ed85c 100644
--- a/newlib/libc/machine/spu/fseek.c
+++ b/newlib/libc/machine/spu/fseek.c
@@ -47,8 +47,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fseek, (fp, offset, whence),
-     register FILE *fp,
+fseek (register FILE *fp,
      long offset,
      int whence)
 {
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index a92cca5a3..87daa4c18 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -45,8 +45,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fsetpos, (iop, pos),
-	FILE * iop,
+fsetpos (FILE * iop,
 	const _fpos_t * pos)
 {
   c99_fsetpos_t args;
diff --git a/newlib/libc/machine/spu/ftell.c b/newlib/libc/machine/spu/ftell.c
index 4782e5ea3..8e56983e5 100644
--- a/newlib/libc/machine/spu/ftell.c
+++ b/newlib/libc/machine/spu/ftell.c
@@ -38,8 +38,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 long
-_DEFUN (ftell, (fp),
-	FILE * fp)
+ftell (FILE * fp)
 {
   long ret;
 
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 0db2f549b..84572af1d 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -49,8 +49,7 @@ typedef struct
 } c99_fwrite_t;
 
 size_t
-_DEFUN (fwrite, (buf, size, count, fp),
-	const void *__restrict buf,
+fwrite (const void *__restrict buf,
 	size_t size,
 	size_t count,
 	FILE * fp)
diff --git a/newlib/libc/machine/spu/perror.c b/newlib/libc/machine/spu/perror.c
index 612467318..eae1419a1 100644
--- a/newlib/libc/machine/spu/perror.c
+++ b/newlib/libc/machine/spu/perror.c
@@ -14,8 +14,7 @@ typedef struct
 } c99_perror_t;
 
 void
-_DEFUN (perror, (s),
-	const char *s)
+perror (const char *s)
 
 {
   c99_perror_t arg;
diff --git a/newlib/libc/machine/spu/puts.c b/newlib/libc/machine/spu/puts.c
index 427508969..27bd2bd52 100644
--- a/newlib/libc/machine/spu/puts.c
+++ b/newlib/libc/machine/spu/puts.c
@@ -5,8 +5,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (puts, (s),
-	char const * s)
+puts (char const * s)
 {
   CHECK_STD_INIT(_REENT);
 
diff --git a/newlib/libc/machine/spu/rewind.c b/newlib/libc/machine/spu/rewind.c
index 8d1a0a90f..e075fc7ee 100644
--- a/newlib/libc/machine/spu/rewind.c
+++ b/newlib/libc/machine/spu/rewind.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #ifndef _REENT_ONLY
 
 void
-_DEFUN (rewind, (fp),
-	FILE * fp)
+rewind (FILE * fp)
 {
   int ret;
 
diff --git a/newlib/libc/machine/spu/setbuf.c b/newlib/libc/machine/spu/setbuf.c
index c942bb9a9..427d5dc8d 100644
--- a/newlib/libc/machine/spu/setbuf.c
+++ b/newlib/libc/machine/spu/setbuf.c
@@ -46,8 +46,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 void
-_DEFUN (setbuf, (fp, buf),
-	FILE *__restrict fp,
+setbuf (FILE *__restrict fp,
 	char *__restrict buf)
 {
   c99_setbuf_t args;
diff --git a/newlib/libc/machine/spu/setvbuf.c b/newlib/libc/machine/spu/setvbuf.c
index a045cc37b..91c1cf3bf 100644
--- a/newlib/libc/machine/spu/setvbuf.c
+++ b/newlib/libc/machine/spu/setvbuf.c
@@ -50,8 +50,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (setvbuf, (fp, buf, mode, size),
-	FILE * fp,
+setvbuf (FILE * fp,
 	char *buf,
 	int mode,
 	size_t size)
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c
index 14332b475..2a308b8aa 100644
--- a/newlib/libc/machine/spu/stdio.c
+++ b/newlib/libc/machine/spu/stdio.c
@@ -39,8 +39,7 @@ Author: Kazunori Asayama <asayama@sm.sony.co.jp>
 static FILE __fp[SPE_FOPEN_MAX];
 
 FILE *
-_DEFUN (__sfp, (d),
-	struct _reent *d)
+__sfp (struct _reent *d)
 {
   int i;
   for (i = 0; i < SPE_FOPEN_MAX; i++) {
@@ -53,8 +52,7 @@ _DEFUN (__sfp, (d),
 }
 
 static void
-_DEFUN (__cleanup, (s),
-	struct _reent *s)
+__cleanup (struct _reent *s)
 {
   int i;
   for (i = 0; i < SPE_FOPEN_MAX; i++) {
@@ -65,8 +63,7 @@ _DEFUN (__cleanup, (s),
 }
 
 void
-_DEFUN (__sinit, (s),
-	struct _reent *s)
+__sinit (struct _reent *s)
 {
   s->__cleanup = __cleanup;
   s->__sdidinit = 1;
diff --git a/newlib/libc/machine/spu/tmpnam.c b/newlib/libc/machine/spu/tmpnam.c
index 5cbf2793b..898a1a70f 100644
--- a/newlib/libc/machine/spu/tmpnam.c
+++ b/newlib/libc/machine/spu/tmpnam.c
@@ -35,8 +35,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 #include "c99ppe.h"
 
 char *
-_DEFUN (tmpnam, (s),
-	char *s)
+tmpnam (char *s)
 {
   /* The return value gets written over buf
    */
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index 90dcaef56..6e436421b 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -57,8 +57,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vfprintf, (fp, fmt0, ap),
-	FILE *__restrict fp,
+vfprintf (FILE *__restrict fp,
 	const char *__restrict fmt0,
 	va_list ap)
 {
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index c22f76db7..9af12e91a 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -57,8 +57,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vfscanf, (fp, fmt, ap),
-    FILE *__restrict fp,
+vfscanf (FILE *__restrict fp,
     const char *__restrict fmt,
     va_list ap)
 {
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index e99144623..29cac0c8d 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -23,8 +23,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vprintf, (fmt, ap),
-     const char *fmt,
+vprintf (const char *fmt,
      va_list ap)
 {
   c99_vprintf_t args;
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index aae6bc45b..39348905d 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -55,8 +55,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vscanf, (fmt, ap),
-     const char *fmt,
+vscanf (const char *fmt,
      va_list ap)
 {
   c99_vscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index b30770d68..81ba7bef2 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -27,8 +27,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vsnprintf, (str, size, fmt, ap),
-     char *__restrict str,
+vsnprintf (char *__restrict str,
      size_t size,
      const char *__restrict fmt,
      va_list ap)
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 12461c08e..8b0e414de 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -26,8 +26,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vsprintf, (str, fmt, ap),
-     char *__restrict str,
+vsprintf (char *__restrict str,
      const char *__restrict fmt,
      va_list ap)
 {
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 7725e6822..a94b152d2 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -57,8 +57,7 @@ typedef struct
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (vsscanf, (str, fmt, ap),
-    const char *__restrict str,
+vsscanf (const char *__restrict str,
     const char *__restrict fmt,
     va_list ap)
 {
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index 5fa30e0ab..592d714c2 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -177,8 +177,7 @@ parse_number (s, p)
 /* Fetch the number at S of SIZE bytes.  */
 
 static long
-_DEFUN(get_number, (s, size, unsigned_p),
-     char *s,
+get_number (char *s,
      long size,
      int unsigned_p)
 {
@@ -220,8 +219,7 @@ _DEFUN(get_number, (s, size, unsigned_p),
 /* Print X in base BASE.  */
 
 static void
-_DEFUN(print_number, (base, unsigned_p, n),
-     int base,
+print_number (int base,
      int unsigned_p,
      long n)
 {
@@ -254,8 +252,7 @@ _DEFUN(print_number, (base, unsigned_p, n),
    stdio is working.  */
 
 static void
-_DEFUN(write_char, (c),
-     char c)
+write_char (char c)
 {
   _write_r (_REENT, CONSOLE_FD, &c, 1);
 }
@@ -265,8 +262,7 @@ _DEFUN(write_char, (c),
    stdio is working.  */
 
 static void
-_DEFUN(write_string, (s),
-     const char *s)
+write_string (const char *s)
 {
   _write_r (_REENT, CONSOLE_FD, s, strlen (s));
 }
diff --git a/newlib/libc/posix/_isatty.c b/newlib/libc/posix/_isatty.c
index 7d6ccae7c..c4dcc1f9c 100644
--- a/newlib/libc/posix/_isatty.c
+++ b/newlib/libc/posix/_isatty.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 
 int
-_DEFUN(_isatty, (fd), int fd)
+_isatty (int fd)
 {
   struct stat buf;
 
diff --git a/newlib/libc/posix/closedir.c b/newlib/libc/posix/closedir.c
index 7801da043..032636d09 100644
--- a/newlib/libc/posix/closedir.c
+++ b/newlib/libc/posix/closedir.c
@@ -49,8 +49,7 @@ extern void _cleanupdir (DIR *dirp);
  * close a directory.
  */
 int
-_DEFUN(closedir, (dirp),
-       register DIR *dirp)
+closedir (register DIR *dirp)
 {
 	int rc;
 
diff --git a/newlib/libc/posix/creat.c b/newlib/libc/posix/creat.c
index 116f26ce3..fab807375 100644
--- a/newlib/libc/posix/creat.c
+++ b/newlib/libc/posix/creat.c
@@ -5,8 +5,7 @@
 #include <fcntl.h>
 
 int
-_DEFUN(creat, (path, mode), 
-       const char *path,
+creat (const char *path,
        mode_t mode)
 {
   return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index e25f21917..6ba95e2dc 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -18,8 +18,7 @@ static char ***p_environ = &environ;
 #include <stdarg.h>
 
 int
-_DEFUN(execl, (path, arg0, ...), 
-      const char *path,
+execl (const char *path,
       const char *arg0, ...)
 
 #else
@@ -27,8 +26,7 @@ _DEFUN(execl, (path, arg0, ...),
 #include <varargs.h>
 
 int
-_DEFUN(execl, (path, arg0, va_alist),
-     const char *path,
+execl (const char *path,
      const char *arg0,
      va_dcl)
 
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index 67387f545..641bdac72 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -13,8 +13,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN(execle, (path, arg0, ...),
-      const char *path,
+execle (const char *path,
       const char *arg0, ...)
 
 #else
@@ -22,8 +21,7 @@ _DEFUN(execle, (path, arg0, ...),
 #include <varargs.h>
 
 int
-_DEFUN(execle, (path, arg0, va_alist),
-     const char *path,
+execle (const char *path,
      const char *arg0,
      va_dcl)
 
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index f1de21f1c..41b300d8f 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -13,8 +13,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN(execlp, (path, arg0, ...),
-      const char *path,
+execlp (const char *path,
       const char *arg0, ...)
 
 #else
@@ -22,8 +21,7 @@ _DEFUN(execlp, (path, arg0, ...),
 #include <varargs.h>
 
 int
-_DEFUN(execlp, (path, arg0, va_alist),
-     const char *path,
+execlp (const char *path,
      const char *arg0,
      va_dcl)
 
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 96220dd98..6a1052c26 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -14,8 +14,7 @@
 static char ***p_environ = &environ;
 
 int
-_DEFUN (execv, (path, argv), 
-	const char *path,
+execv (const char *path,
 	char * const argv[])
 {
   return _execve (path, (char * const *) argv, *p_environ);
diff --git a/newlib/libc/posix/execve.c b/newlib/libc/posix/execve.c
index c2a2144f5..99c145426 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -10,8 +10,7 @@
 
 
 int
-_DEFUN(execve, (path, argv, envp),
-      const char *path,
+execve (const char *path,
       char * const argv[],
       char * const envp[])
 {
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index 1c1fd3a01..be7e71cea 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -21,8 +21,7 @@
  */
 
 static char *
-_DEFUN (strccpy, (s1, s2, c),
-	char *s1,
+strccpy (char *s1,
 	char *s2,
 	char c)
 {
@@ -36,8 +35,7 @@ _DEFUN (strccpy, (s1, s2, c),
 }
 
 int
-_DEFUN (execvp, (file, argv),
-	const char *file,
+execvp (const char *file,
 	char * const argv[])
 {
   char *path = getenv ("PATH");
diff --git a/newlib/libc/posix/isatty.c b/newlib/libc/posix/isatty.c
index afd5ec85e..8a6740a55 100644
--- a/newlib/libc/posix/isatty.c
+++ b/newlib/libc/posix/isatty.c
@@ -4,7 +4,7 @@
 #include <reent.h>
 
 int
-_DEFUN(isatty, (fd), int fd)
+isatty (int fd)
 {
   return _isatty (fd);
 }
diff --git a/newlib/libc/posix/opendir.c b/newlib/libc/posix/opendir.c
index ca764e156..1416f1053 100644
--- a/newlib/libc/posix/opendir.c
+++ b/newlib/libc/posix/opendir.c
@@ -47,8 +47,7 @@ static char sccsid[] = "@(#)opendir.c	5.11 (Berkeley) 2/23/91";
  * open a directory.
  */
 DIR *
-_DEFUN(opendir, (name),
-	const char *name)
+opendir (const char *name)
 {
 	register DIR *dirp;
 	register int fd;
diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c
index bbd0fc424..04aca4c9f 100644
--- a/newlib/libc/posix/popen.c
+++ b/newlib/libc/posix/popen.c
@@ -109,8 +109,7 @@ static struct pid {
 } *pidlist;
 
 FILE *
-_DEFUN(popen, (program, type),
-	const char *program,
+popen (const char *program,
 	const char *type)
 {
 	struct pid *cur;
@@ -197,8 +196,7 @@ _DEFUN(popen, (program, type),
  *	if already `pclosed', or waitpid returns an error.
  */
 int
-_DEFUN(pclose, (iop),
-	FILE *iop)
+pclose (FILE *iop)
 {
 	register struct pid *cur, *last;
 	int pstat;
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index cade6b005..19c5cd0fe 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -294,8 +294,7 @@ do_posix_spawn(pid_t *pid, const char *path,
 }
 
 int
-_DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
-	pid_t *pid,
+posix_spawn (pid_t *pid,
 	const char *path,
 	const posix_spawn_file_actions_t *fa,
 	const posix_spawnattr_t *sa,
@@ -306,8 +305,7 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
 }
 
 int
-_DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
-	pid_t *pid,
+posix_spawnp (pid_t *pid,
 	const char *path,
 	const posix_spawn_file_actions_t *fa,
 	const posix_spawnattr_t *sa,
@@ -322,8 +320,7 @@ _DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
  */
 
 int
-_DEFUN(posix_spawn_file_actions_init, (ret),
-	posix_spawn_file_actions_t *ret)
+posix_spawn_file_actions_init (posix_spawn_file_actions_t *ret)
 {
 	posix_spawn_file_actions_t fa;
 
@@ -337,8 +334,7 @@ _DEFUN(posix_spawn_file_actions_init, (ret),
 }
 
 int
-_DEFUN(posix_spawn_file_actions_destroy, (fa),
-	posix_spawn_file_actions_t *fa)
+posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *fa)
 {
 	posix_spawn_file_actions_entry_t *fae;
 
@@ -357,8 +353,7 @@ _DEFUN(posix_spawn_file_actions_destroy, (fa),
 }
 
 int
-_DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
-	posix_spawn_file_actions_t * __restrict fa,
+posix_spawn_file_actions_addopen (posix_spawn_file_actions_t * __restrict fa,
 	int fildes,
 	const char * __restrict path,
 	int oflag,
@@ -392,8 +387,7 @@ _DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
 }
 
 int
-_DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
-	posix_spawn_file_actions_t *fa,
+posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *fa,
 	int fildes,
 	int newfildes)
 {
@@ -417,8 +411,7 @@ _DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
 }
 
 int
-_DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
-	posix_spawn_file_actions_t *fa,
+posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *fa,
 	int fildes)
 {
 	posix_spawn_file_actions_entry_t *fae;
@@ -444,8 +437,7 @@ _DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
  */
 
 int
-_DEFUN(posix_spawnattr_init, (ret),
-	posix_spawnattr_t *ret)
+posix_spawnattr_init (posix_spawnattr_t *ret)
 {
 	posix_spawnattr_t sa;
 
@@ -459,16 +451,14 @@ _DEFUN(posix_spawnattr_init, (ret),
 }
 
 int
-_DEFUN(posix_spawnattr_destroy, (sa),
-	posix_spawnattr_t *sa)
+posix_spawnattr_destroy (posix_spawnattr_t *sa)
 {
 	free(*sa);
 	return (0);
 }
 
 int
-_DEFUN(posix_spawnattr_getflags, (sa, flags),
-	const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getflags (const posix_spawnattr_t * __restrict sa,
 	short * __restrict flags)
 {
 	*flags = (*sa)->sa_flags;
@@ -476,8 +466,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
 }
 
 int
-_DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
-	const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getpgroup (const posix_spawnattr_t * __restrict sa,
 	pid_t * __restrict pgroup)
 {
 	*pgroup = (*sa)->sa_pgroup;
@@ -485,8 +474,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
 }
 
 int
-_DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
-	const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getschedparam (const posix_spawnattr_t * __restrict sa,
 	struct sched_param * __restrict schedparam)
 {
 	*schedparam = (*sa)->sa_schedparam;
@@ -494,8 +482,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
 }
 
 int
-_DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
-	const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getschedpolicy (const posix_spawnattr_t * __restrict sa,
 	int * __restrict schedpolicy)
 {
 	*schedpolicy = (*sa)->sa_schedpolicy;
@@ -503,8 +490,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
 }
 
 int
-_DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
-	const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getsigdefault (const posix_spawnattr_t * __restrict sa,
 	sigset_t * __restrict sigdefault)
 {
 	*sigdefault = (*sa)->sa_sigdefault;
@@ -512,8 +498,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
 }
 
 int
-_DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
-	const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getsigmask (const posix_spawnattr_t * __restrict sa,
 	sigset_t * __restrict sigmask)
 {
 	*sigmask = (*sa)->sa_sigmask;
@@ -521,8 +506,7 @@ _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
 }
 
 int
-_DEFUN(posix_spawnattr_setflags, (sa, flags),
-	posix_spawnattr_t *sa,
+posix_spawnattr_setflags (posix_spawnattr_t *sa,
 	short flags)
 {
 	(*sa)->sa_flags = flags;
@@ -530,8 +514,7 @@ _DEFUN(posix_spawnattr_setflags, (sa, flags),
 }
 
 int
-_DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
-	posix_spawnattr_t *sa,
+posix_spawnattr_setpgroup (posix_spawnattr_t *sa,
 	pid_t pgroup)
 {
 	(*sa)->sa_pgroup = pgroup;
@@ -539,8 +522,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
 }
 
 int
-_DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
-	posix_spawnattr_t * __restrict sa,
+posix_spawnattr_setschedparam (posix_spawnattr_t * __restrict sa,
 	const struct sched_param * __restrict schedparam)
 {
 	(*sa)->sa_schedparam = *schedparam;
@@ -548,8 +530,7 @@ _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
 }
 
 int
-_DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
-	posix_spawnattr_t *sa,
+posix_spawnattr_setschedpolicy (posix_spawnattr_t *sa,
 	int schedpolicy)
 {
 	(*sa)->sa_schedpolicy = schedpolicy;
@@ -557,8 +538,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
 }
 
 int
-_DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
-	posix_spawnattr_t * __restrict sa,
+posix_spawnattr_setsigdefault (posix_spawnattr_t * __restrict sa,
 	const sigset_t * __restrict sigdefault)
 {
 	(*sa)->sa_sigdefault = *sigdefault;
@@ -566,8 +546,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
 }
 
 int
-_DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
-	posix_spawnattr_t * __restrict sa,
+posix_spawnattr_setsigmask (posix_spawnattr_t * __restrict sa,
 	const sigset_t * __restrict sigmask)
 {
 	(*sa)->sa_sigmask = *sigmask;
diff --git a/newlib/libc/posix/readdir.c b/newlib/libc/posix/readdir.c
index 3e620e328..40608f93c 100644
--- a/newlib/libc/posix/readdir.c
+++ b/newlib/libc/posix/readdir.c
@@ -45,8 +45,7 @@ extern int getdents (int fd, void *dp, int count);
  * get next entry in a directory.
  */
 struct dirent *
-_DEFUN(readdir, (dirp),
-       register DIR *dirp)
+readdir (register DIR *dirp)
 {
   register struct dirent *dp;
  
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
index a75eee9a3..8f4a98293 100644
--- a/newlib/libc/posix/readdir_r.c
+++ b/newlib/libc/posix/readdir_r.c
@@ -50,8 +50,7 @@ extern int getdents (int fd, void *dp, int count);
  * get next entry in a directory using supplied dirent structure.
  */
 int
-_DEFUN(readdir_r, (dirp, dp, dpp),
-	register DIR *__restrict dirp,
+readdir_r (register DIR *__restrict dirp,
 	struct dirent *__restrict dp,
 	struct dirent **__restrict dpp) {
 
diff --git a/newlib/libc/posix/rewinddir.c b/newlib/libc/posix/rewinddir.c
index f9ca9f7d4..930b79afc 100644
--- a/newlib/libc/posix/rewinddir.c
+++ b/newlib/libc/posix/rewinddir.c
@@ -42,8 +42,7 @@ static char sccsid[] = "@(#)rewinddir.c	5.1 (Berkeley) 5/25/90";
 #include <sys/lock.h>
 
 void
-_DEFUN(rewinddir, (dirp),
-	DIR *dirp)
+rewinddir (DIR *dirp)
 {
 #ifdef HAVE_DD_LOCK
 	__lock_acquire_recursive(dirp->dd_lock);
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 0ffe68971..d95cff378 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -68,8 +68,7 @@ static char sccsid[] = "@(#)scandir.c	5.10 (Berkeley) 2/23/91";
 #endif
 
 int
-_DEFUN(scandir, (dirname, namelist, select, dcomp),
-	const char *dirname,
+scandir (const char *dirname,
 	struct dirent ***namelist,
 	int (*select) __P((const struct dirent *)),
 	int (*dcomp) __P((const struct dirent **, const struct dirent **)))
@@ -169,8 +168,7 @@ cleanup:
  * Alphabetic order comparison routine for those who want it.
  */
 int
-_DEFUN(alphasort, (d1, d2),
-       const struct dirent **d1,
+alphasort (const struct dirent **d1,
        const struct dirent **d2)
 {
        return(strcmp((*d1)->d_name, (*d2)->d_name));
diff --git a/newlib/libc/posix/seekdir.c b/newlib/libc/posix/seekdir.c
index f876d7075..6ffeb1415 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -46,8 +46,7 @@ static char sccsid[] = "@(#)seekdir.c	5.7 (Berkeley) 6/1/90";
  * _seekdir is in telldir.c so that it can share opaque data structures.
  */
 void
-_DEFUN(seekdir, (dirp, loc),
-	DIR *dirp,
+seekdir (DIR *dirp,
 	long loc)
 {
 #ifdef HAVE_DD_LOCK
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index 9c945fcf7..af86d8d4f 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -81,8 +81,7 @@ __LOCK_INIT(static, __dd_hash_mutex);
 #if !defined(_ELIX_LEVEL) || (_ELIX_LEVEL >= 2)
 
 long
-_DEFUN(telldir, (dirp),
-       DIR *dirp)
+telldir (DIR *dirp)
 {
 	register int index;
 	register struct ddloc *lp;
@@ -119,8 +118,7 @@ _DEFUN(telldir, (dirp),
  * Only values returned by "telldir" should be passed to seekdir.
  */
 void
-_DEFUN(_seekdir, (dirp, loc),
-	register DIR *dirp,
+_seekdir (register DIR *dirp,
 	long loc)
 {
 	register struct ddloc *lp;
@@ -173,8 +171,7 @@ found:
 
 /* clean out any hash entries from a closed directory */
 void
-_DEFUN(_cleanupdir, (dirp),
-	register DIR *dirp)
+_cleanupdir (register DIR *dirp)
 {
 	int i;
 
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 0dc531384..59b61223e 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -45,8 +45,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_execve_r, (ptr, name, argv, env),
-     struct _reent *ptr,
+_execve_r (struct _reent *ptr,
      const char *name,
      char *const argv[],
      char *const env[])
@@ -81,8 +80,7 @@ DESCRIPTION
 #ifndef NO_FORK
 
 int
-_DEFUN (_fork_r, (ptr),
-     struct _reent *ptr)
+_fork_r (struct _reent *ptr)
 {
   int ret;
 
@@ -113,8 +111,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_wait_r, (ptr, status),
-     struct _reent *ptr,
+_wait_r (struct _reent *ptr,
      int *status)
 {
   int ret;
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
index fdfe41090..cd19d226f 100644
--- a/newlib/libc/reent/fcntlr.c
+++ b/newlib/libc/reent/fcntlr.c
@@ -40,8 +40,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
-     struct _reent *ptr,
+_fcntl_r (struct _reent *ptr,
      int fd,
      int cmd,
      int arg)
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
index 06a89a5c8..c546f5c1d 100644
--- a/newlib/libc/reent/fstat64r.c
+++ b/newlib/libc/reent/fstat64r.c
@@ -47,8 +47,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_fstat64_r, (ptr, fd, pstat),
-     struct _reent *ptr,
+_fstat64_r (struct _reent *ptr,
      int fd,
      struct stat64 *pstat)
 {
diff --git a/newlib/libc/reent/gettimeofdayr.c b/newlib/libc/reent/gettimeofdayr.c
index 80942afb0..9b982a993 100644
--- a/newlib/libc/reent/gettimeofdayr.c
+++ b/newlib/libc/reent/gettimeofdayr.c
@@ -52,8 +52,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
-     struct _reent *ptr,
+_gettimeofday_r (struct _reent *ptr,
      struct timeval *ptimeval,
      void *ptimezone)
 {
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 5e85f2d2e..b22da5f94 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -43,8 +43,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_link_r, (ptr, old, new),
-     struct _reent *ptr,
+_link_r (struct _reent *ptr,
      const char *old,
      const char *new)
 {
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
index 2f16f0bca..40769fb6d 100644
--- a/newlib/libc/reent/lseek64r.c
+++ b/newlib/libc/reent/lseek64r.c
@@ -41,8 +41,7 @@ DESCRIPTION
 */
 
 _off64_t
-_DEFUN (_lseek64_r, (ptr, fd, pos, whence),
-     struct _reent *ptr,
+_lseek64_r (struct _reent *ptr,
      int fd,
      _off64_t pos,
      int whence)
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index 639158912..ac2daaab9 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -38,8 +38,7 @@ DESCRIPTION
 */
 
 _off_t
-_DEFUN (_lseek_r, (ptr, fd, pos, whence),
-     struct _reent *ptr,
+_lseek_r (struct _reent *ptr,
      int fd,
      _off_t pos,
      int whence)
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index dca20dc2c..fd72df64c 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -40,8 +40,7 @@ DESCRIPTION
 #include <sys/stat.h>
 
 int
-_DEFUN (_mkdir_r, (ptr, path, mode),
-     struct _reent *ptr,
+_mkdir_r (struct _reent *ptr,
      const char *path,
      int mode)
 {
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index 33ace75ad..c6a7db5de 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -39,8 +39,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_open_r, (ptr, file, flags, mode),
-     struct _reent *ptr,
+_open_r (struct _reent *ptr,
      const char *file,
      int flags,
      int mode)
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index 9a3a694cc..7fccefd32 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -38,8 +38,7 @@ DESCRIPTION
 */
 
 _ssize_t
-_DEFUN (_read_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr,
+_read_r (struct _reent *ptr,
      int fd,
      void *buf,
      size_t cnt)
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index a98c3110c..7c57e2019 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -30,8 +30,7 @@ int errno;
 /* Interim cleanup code */
 
 void
-_DEFUN (cleanup_glue, (ptr, glue),
-     struct _reent *ptr,
+cleanup_glue (struct _reent *ptr,
      struct _glue *glue)
 {
   /* Have to reclaim these in reverse order: */
@@ -42,8 +41,7 @@ _DEFUN (cleanup_glue, (ptr, glue),
 }
 
 void
-_DEFUN (_reclaim_reent, (ptr),
-     struct _reent *ptr)
+_reclaim_reent (struct _reent *ptr)
 {
   if (ptr != _impure_ptr)
     {
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index 736c1a30f..5420dc4a0 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -40,8 +40,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_rename_r, (ptr, old, new),
-     struct _reent *ptr,
+_rename_r (struct _reent *ptr,
      const char *old,
      const char *new)
 {
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index 0bc4163c1..21c4bd913 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -41,8 +41,7 @@ DESCRIPTION
 */
 
 void *
-_DEFUN (_sbrk_r, (ptr, incr),
-     struct _reent *ptr,
+_sbrk_r (struct _reent *ptr,
      ptrdiff_t incr)
 {
   char *ret;
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 9229061d5..345910e4b 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -43,8 +43,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_kill_r, (ptr, pid, sig),
-     struct _reent *ptr,
+_kill_r (struct _reent *ptr,
      int pid,
      int sig)
 {
@@ -78,8 +77,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_getpid_r, (ptr),
-     struct _reent *ptr)
+_getpid_r (struct _reent *ptr)
 {
   int ret;
   ret = _getpid ();
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 2077c0a2e..b64736ef2 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -45,8 +45,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_stat64_r, (ptr, file, pstat),
-     struct _reent *ptr,
+_stat64_r (struct _reent *ptr,
      const char *file,
      struct stat64 *pstat)
 {
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index fb27ab0c0..9388e0246 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -45,8 +45,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_stat_r, (ptr, file, pstat),
-     struct _reent *ptr,
+_stat_r (struct _reent *ptr,
      const char *file,
      struct stat *pstat)
 {
diff --git a/newlib/libc/reent/timesr.c b/newlib/libc/reent/timesr.c
index dbe6a4ef0..bb890035a 100644
--- a/newlib/libc/reent/timesr.c
+++ b/newlib/libc/reent/timesr.c
@@ -44,8 +44,7 @@ DESCRIPTION
 */
 
 clock_t
-_DEFUN (_times_r, (ptr, ptms),
-     struct _reent *ptr,
+_times_r (struct _reent *ptr,
      struct tms *ptms)
 {
   clock_t ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index 0ef0ff56e..41bac0194 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -38,8 +38,7 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_unlink_r, (ptr, file),
-     struct _reent *ptr,
+_unlink_r (struct _reent *ptr,
      const char *file)
 {
   int ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 8d4b37530..704aba18b 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -38,8 +38,7 @@ DESCRIPTION
 */
 
 _ssize_t
-_DEFUN (_write_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr,
+_write_r (struct _reent *ptr,
      int fd,
      const void *buf,
      size_t cnt)
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 79a489680..2f1dc9d77 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 
 void *
-_DEFUN (bsearch, (key, base, nmemb, size, compar),
-	const void *key,
+bsearch (const void *key,
 	const void *base,
 	size_t nmemb,
 	size_t size,
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index f20322c42..af2be9aa8 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.c
@@ -104,8 +104,7 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
 /* OPEN/CLOSE */
 
 extern DB *
-_DEFUN(__hash_open, (file, flags, mode, info, dflags),
-	const char *file,
+__hash_open (const char *file,
 	int flags,
 	int mode,
 	int dflags,
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index 5472de1f0..7664353cc 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
 static struct hsearch_data htab;
 
 int
-_DEFUN(hcreate, (nel), size_t nel)
+hcreate (size_t nel)
 {
   return hcreate_r (nel, &htab);
 }
@@ -69,8 +69,7 @@ hdestroy (void)
 }
 
 ENTRY *
-_DEFUN(hsearch, (item, action), 
-       ENTRY item,
+hsearch (ENTRY item,
        ACTION action)
 {
   ENTRY *retval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index 6c84b95b7..db3f58951 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -100,8 +100,7 @@ static inline void	 swapfunc (char *, char *, int, int);
 	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
 
 static inline void
-_DEFUN(swapfunc, (a, b, n, swaptype),
-	char *a,
+swapfunc (char *a,
 	char *b,
 	int n,
 	int swaptype)
@@ -131,8 +130,7 @@ _DEFUN(swapfunc, (a, b, n, swaptype),
 #endif
 
 static inline char *
-_DEFUN(med3, (a, b, c, cmp, thunk),
-	char *a,
+med3 (char *a,
 	char *b,
 	char *c,
 	cmp_t *cmp,
@@ -149,16 +147,14 @@ __unused
 
 #if defined(I_AM_QSORT_R)
 void
-_DEFUN(__bsd_qsort_r, (a, n, es, thunk, cmp),
-	void *a,
+__bsd_qsort_r (void *a,
 	size_t n,
 	size_t es,
 	void *thunk,
 	cmp_t *cmp)
 #elif defined(I_AM_GNU_QSORT_R)
 void
-_DEFUN(qsort_r, (a, n, es, cmp, thunk),
-	void *a,
+qsort_r (void *a,
 	size_t n,
 	size_t es,
 	cmp_t *cmp,
@@ -166,8 +162,7 @@ _DEFUN(qsort_r, (a, n, es, cmp, thunk),
 #else
 #define thunk NULL
 void
-_DEFUN(qsort, (a, n, es, cmp),
-	void *a,
+qsort (void *a,
 	size_t n,
 	size_t es,
 	cmp_t *cmp)
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
index a0128e98b..a595200db 100644
--- a/newlib/libc/search/tdelete.c
+++ b/newlib/libc/search/tdelete.c
@@ -26,8 +26,7 @@ __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 
 /* delete node with given key */
 void *
-_DEFUN(tdelete, (vkey, vrootp, compar),
-	const void *__restrict vkey,	/* key to be deleted */
+tdelete (const void *__restrict vkey,	/* key to be deleted */
 	void      **__restrict vrootp,	/* address of the root of tree */
 	int       (*compar)(const void *, const void *))
 {
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
index e1418207a..04c6b7052 100644
--- a/newlib/libc/search/tdestroy.c
+++ b/newlib/libc/search/tdestroy.c
@@ -40,8 +40,7 @@ trecurse(root, free_action)
 }
 
 void
-_DEFUN(tdestroy, (vrootp, freefct),
-       void *vrootp,
+tdestroy (void *vrootp,
        void (*freefct)(void *))
 {
   node_t *root = (node_t *) vrootp;
diff --git a/newlib/libc/search/tfind.c b/newlib/libc/search/tfind.c
index 108213048..670f41fca 100644
--- a/newlib/libc/search/tfind.c
+++ b/newlib/libc/search/tfind.c
@@ -25,8 +25,7 @@ __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 
 /* find a node, or return 0 */
 void *
-_DEFUN(tfind, (vkey, vrootp, compar),
-	const void *vkey,		/* key to be found */
+tfind (const void *vkey,		/* key to be found */
 	void **vrootp,		/* address of the tree root */
 	int (*compar)(const void *, const void *))
 {
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
index 8fe265703..82d69447f 100644
--- a/newlib/libc/search/tsearch.c
+++ b/newlib/libc/search/tsearch.c
@@ -25,8 +25,7 @@ __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
 
 /* find or insert datum into search tree */
 void *
-_DEFUN(tsearch, (vkey, vrootp, compar),
-	const void *vkey,		/* key to be located */
+tsearch (const void *vkey,		/* key to be located */
 	void **vrootp,		/* address of tree root */
 	int (*compar)(const void *, const void *))
 {
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
index 26d6e97db..02ef52242 100644
--- a/newlib/libc/search/twalk.c
+++ b/newlib/libc/search/twalk.c
@@ -49,8 +49,7 @@ trecurse(root, action, level)
 
 /* Walk the nodes of a tree */
 void
-_DEFUN(twalk, (vroot, action),
-	const void *vroot,	/* Root of the tree to be walked */
+twalk (const void *vroot,	/* Root of the tree to be walked */
 	void (*action)(const void *, VISIT, int))
 {
 	if (vroot != NULL && action != NULL)
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index a62f8ae01..602714f49 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -34,8 +34,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <string.h>
 
 void
-_DEFUN(psignal, (sig, s),
-       int sig,
+psignal (int sig,
        const char *s)
 {
   if (s != NULL && *s != '\0')
diff --git a/newlib/libc/signal/raise.c b/newlib/libc/signal/raise.c
index 6f93686e6..c678c6e2d 100644
--- a/newlib/libc/signal/raise.c
+++ b/newlib/libc/signal/raise.c
@@ -52,8 +52,7 @@ int _dummy_raise;
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (raise, (sig),
-	int sig)
+raise (int sig)
 {
   return _raise_r (_REENT, sig);
 }
@@ -61,8 +60,7 @@ _DEFUN (raise, (sig),
 #endif
 
 int
-_DEFUN (_raise_r, (reent, sig),
-	struct _reent *reent,
+_raise_r (struct _reent *reent,
 	int sig)
 {
   return _kill_r (reent, _getpid_r (reent), sig);
diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c
index f5fe4c0b9..0110287d8 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -89,8 +89,7 @@ int _dummy_simulated_signal;
 #include <_syslist.h>
 
 int
-_DEFUN (_init_signal_r, (ptr),
-	struct _reent *ptr)
+_init_signal_r (struct _reent *ptr)
 {
   int i;
 
@@ -108,8 +107,7 @@ _DEFUN (_init_signal_r, (ptr),
 }
 
 _sig_func_ptr
-_DEFUN (_signal_r, (ptr, sig, func),
-	struct _reent *ptr,
+_signal_r (struct _reent *ptr,
 	int sig,
 	_sig_func_ptr func)
 {
@@ -131,8 +129,7 @@ _DEFUN (_signal_r, (ptr, sig, func),
 }
 
 int 
-_DEFUN (_raise_r, (ptr, sig),
-     struct _reent *ptr,
+_raise_r (struct _reent *ptr,
      int sig)
 {
   _sig_func_ptr func;
@@ -166,8 +163,7 @@ _DEFUN (_raise_r, (ptr, sig),
 }
 
 int
-_DEFUN (__sigtramp_r, (ptr, sig),
-     struct _reent *ptr,
+__sigtramp_r (struct _reent *ptr,
      int sig)
 {
   _sig_func_ptr func;
@@ -198,15 +194,13 @@ _DEFUN (__sigtramp_r, (ptr, sig),
 #ifndef _REENT_ONLY
 
 int 
-_DEFUN (raise, (sig),
-     int sig)
+raise (int sig)
 {
   return _raise_r (_REENT, sig);
 }
 
 _sig_func_ptr
-_DEFUN (signal, (sig, func),
-	int sig,
+signal (int sig,
 	_sig_func_ptr func)
 {
   return _signal_r (_REENT, sig, func);
@@ -219,7 +213,7 @@ _init_signal (void)
 }
 
 int
-_DEFUN (__sigtramp, (sig), int sig)
+__sigtramp (int sig)
 {
   return __sigtramp_r (_REENT, sig);
 }
diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
index ec60e3ed4..ce6d0a972 100644
--- a/newlib/libc/stdio/asiprintf.c
+++ b/newlib/libc/stdio/asiprintf.c
@@ -25,8 +25,7 @@
 #include "local.h"
 
 int
-_DEFUN(_asiprintf_r, (ptr, strp, fmt),
-       struct _reent *ptr,
+_asiprintf_r (struct _reent *ptr,
        char **strp,
        const char *fmt, ...)
 {
@@ -53,8 +52,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(asiprintf, (strp, fmt),
-       char **strp,
+asiprintf (char **strp,
        const char *fmt, ...)
 {
   int ret;
diff --git a/newlib/libc/stdio/asniprintf.c b/newlib/libc/stdio/asniprintf.c
index ba4772f08..0bfe00d9b 100644
--- a/newlib/libc/stdio/asniprintf.c
+++ b/newlib/libc/stdio/asniprintf.c
@@ -14,8 +14,7 @@
 #include "local.h"
 
 char *
-_DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
-       struct _reent *ptr,
+_asniprintf_r (struct _reent *ptr,
        char *buf,
        size_t *lenp,
        const char *fmt, ...)
@@ -61,8 +60,7 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(asniprintf, (buf, lenp, fmt),
-       char *buf,
+asniprintf (char *buf,
        size_t *lenp,
        const char *fmt, ...)
 {
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index c9a37dbf1..34639dc09 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -14,8 +14,7 @@
 #include "local.h"
 
 char *
-_DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
-       struct _reent *__restrict ptr,
+_asnprintf_r (struct _reent *__restrict ptr,
        char *buf,
        size_t *lenp,
        const char *__restrict fmt, ...)
@@ -67,8 +66,7 @@ _EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(asnprintf, (buf, lenp, fmt),
-       char *__restrict buf,
+asnprintf (char *__restrict buf,
        size_t *__restrict lenp,
        const char *__restrict fmt, ...)
 {
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index b3d9122f5..330491ebe 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -25,8 +25,7 @@
 #include "local.h"
 
 int
-_DEFUN(_asprintf_r, (ptr, strp, fmt),
-       struct _reent *ptr,
+_asprintf_r (struct _reent *ptr,
        char **__restrict strp,
        const char *__restrict fmt, ...)
 {
@@ -59,8 +58,7 @@ _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(asprintf, (strp, fmt),
-       char **__restrict strp,
+asprintf (char **__restrict strp,
        const char *__restrict fmt, ...)
 {
   int ret;
diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index 23e3c18e3..be83d6dd9 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -72,8 +72,7 @@ No supporting OS subroutines are required.
 #undef	clearerr
 
 void
-_DEFUN(clearerr, (fp),
-       FILE * fp)
+clearerr (FILE * fp)
 {
   CHECK_INIT(_REENT, fp);
   _newlib_flockfile_start (fp);
diff --git a/newlib/libc/stdio/clearerr_u.c b/newlib/libc/stdio/clearerr_u.c
index 7514fa2e9..4952f777c 100644
--- a/newlib/libc/stdio/clearerr_u.c
+++ b/newlib/libc/stdio/clearerr_u.c
@@ -33,8 +33,7 @@
 #undef	clearerr_unlocked
 
 void
-_DEFUN(clearerr_unlocked, (fp),
-       FILE * fp)
+clearerr_unlocked (FILE * fp)
 {
   CHECK_INIT(_REENT, fp);
   __sclearerr (fp);
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
index 0059e044b..8ac58354a 100644
--- a/newlib/libc/stdio/diprintf.c
+++ b/newlib/libc/stdio/diprintf.c
@@ -49,8 +49,7 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
 #include <stdarg.h>
 
 int
-_DEFUN(_diprintf_r, (ptr, fd, format),
-       struct _reent *ptr,
+_diprintf_r (struct _reent *ptr,
        int fd,
        const char *format, ...)
 {
@@ -66,8 +65,7 @@ _DEFUN(_diprintf_r, (ptr, fd, format),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(diprintf, (fd, format),
-       int fd,
+diprintf (int fd,
        const char *format, ...)
 {
   va_list ap;
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 5fd45049b..1493e1f18 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -53,8 +53,7 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
 #include "local.h"
 
 int
-_DEFUN(_dprintf_r, (ptr, fd, format),
-       struct _reent *ptr,
+_dprintf_r (struct _reent *ptr,
        int fd,
        const char *__restrict format, ...)
 {
@@ -76,8 +75,7 @@ _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(dprintf, (fd, format),
-       int fd,
+dprintf (int fd,
        const char *__restrict format, ...)
 {
   va_list ap;
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 264d2e48f..1c36057a7 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -56,8 +56,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
 #include "local.h"
 
 int
-_DEFUN(_fclose_r, (rptr, fp),
-      struct _reent *rptr,
+_fclose_r (struct _reent *rptr,
       register FILE * fp)
 {
   int r;
@@ -121,8 +120,7 @@ _DEFUN(_fclose_r, (rptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fclose, (fp),
-       register FILE * fp)
+fclose (register FILE * fp)
 {
   return _fclose_r(_REENT, fp);
 }
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c
index 659172b32..2e78b4b3c 100644
--- a/newlib/libc/stdio/fcloseall.c
+++ b/newlib/libc/stdio/fcloseall.c
@@ -57,8 +57,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
 #include "local.h"
 
 int
-_DEFUN(_fcloseall_r, (ptr),
-       struct _reent *ptr)
+_fcloseall_r (struct _reent *ptr)
 {
   return _fwalk_reent (ptr, _fclose_r);
 }
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 876a94117..854c0183d 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -53,8 +53,7 @@ PORTABILITY
 #include <_syslist.h>
 
 FILE *
-_DEFUN(_fdopen_r, (ptr, fd, mode),
-       struct _reent *ptr,
+_fdopen_r (struct _reent *ptr,
        int fd,
        const char *mode)
 {
@@ -123,8 +122,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN(fdopen, (fd, mode),
-       int fd,
+fdopen (int fd,
        const char *mode)
 {
   return _fdopen_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio/feof.c b/newlib/libc/stdio/feof.c
index 617ce58df..879417936 100644
--- a/newlib/libc/stdio/feof.c
+++ b/newlib/libc/stdio/feof.c
@@ -65,8 +65,7 @@ No supporting OS subroutines are required.
 #undef feof
 
 int 
-_DEFUN(feof, (fp),
-       FILE * fp)
+feof (FILE * fp)
 {
   int result;
   CHECK_INIT(_REENT, fp);
diff --git a/newlib/libc/stdio/feof_u.c b/newlib/libc/stdio/feof_u.c
index 48fc4af47..e9238e113 100644
--- a/newlib/libc/stdio/feof_u.c
+++ b/newlib/libc/stdio/feof_u.c
@@ -32,8 +32,7 @@
 #undef feof_unlocked
 
 int
-_DEFUN(feof_unlocked, (fp),
-       FILE * fp)
+feof_unlocked (FILE * fp)
 {
   CHECK_INIT(_REENT, fp);
   return __sfeof (fp);
diff --git a/newlib/libc/stdio/ferror.c b/newlib/libc/stdio/ferror.c
index f99df2311..3bff52045 100644
--- a/newlib/libc/stdio/ferror.c
+++ b/newlib/libc/stdio/ferror.c
@@ -74,8 +74,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef ferror
 
 int
-_DEFUN(ferror, (fp),
-       FILE * fp)
+ferror (FILE * fp)
 {
   int result;
   CHECK_INIT(_REENT, fp);
diff --git a/newlib/libc/stdio/ferror_u.c b/newlib/libc/stdio/ferror_u.c
index 9b9edba24..ae1e278fd 100644
--- a/newlib/libc/stdio/ferror_u.c
+++ b/newlib/libc/stdio/ferror_u.c
@@ -33,8 +33,7 @@
 #undef ferror_unlocked
 
 int
-_DEFUN(ferror_unlocked, (fp),
-       FILE * fp)
+ferror_unlocked (FILE * fp)
 {
   CHECK_INIT(_REENT, fp);
   return __sferror (fp);
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index 18d6d3e74..e958af9fc 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -100,8 +100,7 @@ No supporting OS subroutines are required.
 /* Core function which does not lock file pointer.  This gets called
    directly from __srefill. */
 int
-_DEFUN(__sflush_r, (ptr, fp),
-       struct _reent *ptr,
+__sflush_r (struct _reent *ptr,
        register FILE * fp)
 {
   register unsigned char *p;
@@ -239,8 +238,7 @@ _DEFUN(__sflush_r, (ptr, fp),
    and we don't want to move the underlying file pointer unless we're
    writing. */
 int
-_DEFUN(__sflushw_r, (ptr, fp),
-       struct _reent *ptr,
+__sflushw_r (struct _reent *ptr,
        register FILE *fp)
 {
   return (fp->_flags & __SWR) ?  __sflush_r (ptr, fp) : 0;
@@ -250,8 +248,7 @@ _DEFUN(__sflushw_r, (ptr, fp),
 #endif /* __IMPL_UNLOCKED__ */
 
 int
-_DEFUN(_fflush_r, (ptr, fp),
-       struct _reent *ptr,
+_fflush_r (struct _reent *ptr,
        register FILE * fp)
 {
   int ret;
@@ -286,8 +283,7 @@ _DEFUN(_fflush_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fflush, (fp),
-       register FILE * fp)
+fflush (register FILE * fp)
 {
   if (fp == NULL)
     return _fwalk_reent (_GLOBAL_REENT, _fflush_r);
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 45404d30e..7d0d4842c 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -85,8 +85,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 int
-_DEFUN(_fgetc_r, (ptr, fp),
-       struct _reent * ptr,
+_fgetc_r (struct _reent * ptr,
        FILE * fp)
 {
   int result;
@@ -100,8 +99,7 @@ _DEFUN(_fgetc_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fgetc, (fp),
-       FILE * fp)
+fgetc (FILE * fp)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   int result;
diff --git a/newlib/libc/stdio/fgetc_u.c b/newlib/libc/stdio/fgetc_u.c
index 45ee3b1b5..9a5719c29 100644
--- a/newlib/libc/stdio/fgetc_u.c
+++ b/newlib/libc/stdio/fgetc_u.c
@@ -29,8 +29,7 @@
 #include "local.h"
 
 int
-_DEFUN(_fgetc_unlocked_r, (ptr, fp),
-       struct _reent * ptr,
+_fgetc_unlocked_r (struct _reent * ptr,
        FILE * fp)
 {
   CHECK_INIT(ptr, fp);
@@ -40,8 +39,7 @@ _DEFUN(_fgetc_unlocked_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fgetc_unlocked, (fp),
-       FILE * fp)
+fgetc_unlocked (FILE * fp)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index 373adfd8e..b4f681281 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -65,8 +65,7 @@ No supporting OS subroutines are required.
 #include <stdio.h>
 
 int
-_DEFUN(_fgetpos_r, (ptr, fp, pos),
-       struct _reent * ptr,
+_fgetpos_r (struct _reent * ptr,
        FILE *__restrict fp,
        _fpos_t *__restrict pos)
 {
@@ -82,8 +81,7 @@ _DEFUN(_fgetpos_r, (ptr, fp, pos),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fgetpos, (fp, pos),
-       FILE *__restrict fp,
+fgetpos (FILE *__restrict fp,
        _fpos_t *__restrict pos)
 {
   return _fgetpos_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index c6ef6d3d5..7adfb2179 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -94,8 +94,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 char *
-_DEFUN(_fgets_r, (ptr, buf, n, fp),
-       struct _reent * ptr,
+_fgets_r (struct _reent * ptr,
        char *__restrict buf,
        int n,
        FILE *__restrict fp)
@@ -189,8 +188,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(fgets, (buf, n, fp),
-       char *__restrict buf,
+fgets (char *__restrict buf,
        int n,
        FILE *__restrict fp)
 {
diff --git a/newlib/libc/stdio/fgetwc.c b/newlib/libc/stdio/fgetwc.c
index 718b53a16..522697e9b 100644
--- a/newlib/libc/stdio/fgetwc.c
+++ b/newlib/libc/stdio/fgetwc.c
@@ -125,8 +125,7 @@ PORTABILITY
 #include "local.h"
 
 wint_t
-_DEFUN(__fgetwc, (ptr, fp),
-	struct _reent *ptr,
+__fgetwc (struct _reent *ptr,
 	register FILE *fp)
 {
   wchar_t wc;
@@ -172,8 +171,7 @@ _DEFUN(__fgetwc, (ptr, fp),
 }
 
 wint_t
-_DEFUN(_fgetwc_r, (ptr, fp),
-	struct _reent *ptr,
+_fgetwc_r (struct _reent *ptr,
 	register FILE *fp)
 {
   wint_t r;
@@ -186,8 +184,7 @@ _DEFUN(_fgetwc_r, (ptr, fp),
 }
 
 wint_t
-_DEFUN(fgetwc, (fp),
-	FILE *fp)
+fgetwc (FILE *fp)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/stdio/fgetwc_u.c b/newlib/libc/stdio/fgetwc_u.c
index f3a4fea61..cbb97360b 100644
--- a/newlib/libc/stdio/fgetwc_u.c
+++ b/newlib/libc/stdio/fgetwc_u.c
@@ -30,8 +30,7 @@
 #include "local.h"
 
 wint_t
-_DEFUN(_fgetwc_unlocked_r, (ptr, fp),
-	struct _reent *ptr,
+_fgetwc_unlocked_r (struct _reent *ptr,
 	register FILE *fp)
 {
   ORIENT(fp, 1);
@@ -39,8 +38,7 @@ _DEFUN(_fgetwc_unlocked_r, (ptr, fp),
 }
 
 wint_t
-_DEFUN(fgetwc_unlocked, (fp),
-	FILE *fp)
+fgetwc_unlocked (FILE *fp)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/stdio/fgetws.c b/newlib/libc/stdio/fgetws.c
index 8ca95d170..c942806c6 100644
--- a/newlib/libc/stdio/fgetws.c
+++ b/newlib/libc/stdio/fgetws.c
@@ -99,8 +99,7 @@ PORTABILITY
 #endif
 
 wchar_t *
-_DEFUN(_fgetws_r, (ptr, ws, n, fp),
-	struct _reent *ptr,
+_fgetws_r (struct _reent *ptr,
 	wchar_t * ws,
 	int n,
 	FILE * fp)
@@ -172,8 +171,7 @@ error:
 }
 
 wchar_t *
-_DEFUN(fgetws, (ws, n, fp),
-	wchar_t *__restrict ws,
+fgetws (wchar_t *__restrict ws,
 	int n,
 	FILE *__restrict fp)
 {
diff --git a/newlib/libc/stdio/fileno.c b/newlib/libc/stdio/fileno.c
index 949a381f8..ceb83f834 100644
--- a/newlib/libc/stdio/fileno.c
+++ b/newlib/libc/stdio/fileno.c
@@ -63,8 +63,7 @@ Supporting OS subroutines required: none.
 #include "local.h"
 
 int
-_DEFUN(fileno, (f),
-       FILE * f)
+fileno (FILE * f)
 {
   int result;
   CHECK_INIT (_REENT, f);
diff --git a/newlib/libc/stdio/fileno_u.c b/newlib/libc/stdio/fileno_u.c
index 468d1127e..830a07d2b 100644
--- a/newlib/libc/stdio/fileno_u.c
+++ b/newlib/libc/stdio/fileno_u.c
@@ -30,8 +30,7 @@
 #include "local.h"
 
 int
-_DEFUN(fileno_unlocked, (f),
-       FILE * f)
+fileno_unlocked (FILE * f)
 {
   int result;
   CHECK_INIT (_REENT, f);
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 031b98b49..cf924536f 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -44,8 +44,7 @@ _NOINLINE_STATIC void
 #else
 static void
 #endif
-_DEFUN(std, (ptr, flags, file),
-            FILE *ptr,
+std (FILE *ptr,
             int flags,
             int file)
 {
@@ -124,8 +123,7 @@ struct glue_with_file {
 };
 
 struct _glue *
-_DEFUN(__sfmoreglue, (d, n),
-       struct _reent *d,
+__sfmoreglue (struct _reent *d,
        register int n)
 {
   struct glue_with_file *g;
@@ -146,8 +144,7 @@ _DEFUN(__sfmoreglue, (d, n),
  */
 
 FILE *
-_DEFUN(__sfp, (d),
-       struct _reent *d)
+__sfp (struct _reent *d)
 {
   FILE *fp;
   int n;
@@ -204,8 +201,7 @@ found:
  */
 
 void
-_DEFUN(_cleanup_r, (ptr),
-       struct _reent *ptr)
+_cleanup_r (struct _reent *ptr)
 {
   int (*cleanup_func) (struct _reent *, FILE *);
 #ifdef _STDIO_BSD_SEMANTICS
@@ -246,8 +242,7 @@ _cleanup (void)
  */
 
 void
-_DEFUN(__sinit, (s),
-       struct _reent *s)
+__sinit (struct _reent *s)
 {
   __sinit_lock_acquire ();
 
@@ -329,8 +324,7 @@ __sinit_lock_release (void)
 
 /* Walkable file locking routine.  */
 static int
-_DEFUN(__fp_lock, (ptr),
-       FILE * ptr)
+__fp_lock (FILE * ptr)
 {
   if (!(ptr->_flags2 & __SNLK))
     _flockfile (ptr);
@@ -340,8 +334,7 @@ _DEFUN(__fp_lock, (ptr),
 
 /* Walkable file unlocking routine.  */
 static int
-_DEFUN(__fp_unlock, (ptr),
-       FILE * ptr)
+__fp_unlock (FILE * ptr)
 {
   if (!(ptr->_flags2 & __SNLK))
     _funlockfile (ptr);
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index e86bf86e5..ff0946287 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -22,8 +22,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN(_fiprintf_r, (ptr, fp, fmt),
-       struct _reent *ptr,
+_fiprintf_r (struct _reent *ptr,
        FILE * fp,
        const char *fmt, ...)
 {
@@ -39,8 +38,7 @@ _DEFUN(_fiprintf_r, (ptr, fp, fmt),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fiprintf, (fp, fmt),
-       FILE * fp,
+fiprintf (FILE * fp,
        const char *fmt, ...)
 {
   int ret;
diff --git a/newlib/libc/stdio/flags.c b/newlib/libc/stdio/flags.c
index b8f660ec4..71fc1f60a 100644
--- a/newlib/libc/stdio/flags.c
+++ b/newlib/libc/stdio/flags.c
@@ -30,8 +30,7 @@
  */
 
 int
-_DEFUN(__sflags, (ptr, mode, optr),
-       struct _reent *ptr,
+__sflags (struct _reent *ptr,
        register char *mode,
        int *optr)
 {
diff --git a/newlib/libc/stdio/fmemopen.c b/newlib/libc/stdio/fmemopen.c
index 6a6153fbd..0d043520e 100644
--- a/newlib/libc/stdio/fmemopen.c
+++ b/newlib/libc/stdio/fmemopen.c
@@ -83,8 +83,7 @@ typedef struct fmemcookie {
 /* Read up to non-zero N bytes into BUF from stream described by
    COOKIE; return number of bytes read (0 on EOF).  */
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(fmemreader, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+fmemreader (struct _reent *ptr,
        void *cookie,
        char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -103,8 +102,7 @@ _DEFUN(fmemreader, (ptr, cookie, buf, n),
 /* Write up to non-zero N bytes of BUF into the stream described by COOKIE,
    returning the number of bytes written or EOF on failure.  */
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(fmemwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+fmemwriter (struct _reent *ptr,
        void *cookie,
        const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -159,8 +157,7 @@ _DEFUN(fmemwriter, (ptr, cookie, buf, n),
 /* Seek to position POS relative to WHENCE within stream described by
    COOKIE; return resulting position or fail with EOF.  */
 static _fpos_t
-_DEFUN(fmemseeker, (ptr, cookie, pos, whence),
-       struct _reent *ptr,
+fmemseeker (struct _reent *ptr,
        void *cookie,
        _fpos_t pos,
        int whence)
@@ -214,8 +211,7 @@ _DEFUN(fmemseeker, (ptr, cookie, pos, whence),
    COOKIE; return resulting position or fail with EOF.  */
 #ifdef __LARGE64_FILES
 static _fpos64_t
-_DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
-       struct _reent *ptr,
+fmemseeker64 (struct _reent *ptr,
        void *cookie,
        _fpos64_t pos,
        int whence)
@@ -256,8 +252,7 @@ _DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
 
 /* Reclaim resources used by stream described by COOKIE.  */
 static int
-_DEFUN(fmemcloser, (ptr, cookie),
-       struct _reent *ptr,
+fmemcloser (struct _reent *ptr,
        void *cookie)
 {
   fmemcookie *c = (fmemcookie *) cookie;
@@ -268,8 +263,7 @@ _DEFUN(fmemcloser, (ptr, cookie),
 /* Open a memstream around buffer BUF of SIZE bytes, using MODE.
    Return the new stream, or fail with NULL.  */
 FILE *
-_DEFUN(_fmemopen_r, (ptr, buf, size, mode),
-       struct _reent *ptr,
+_fmemopen_r (struct _reent *ptr,
        void *__restrict buf,
        size_t size,
        const char *__restrict mode)
@@ -361,8 +355,7 @@ _DEFUN(_fmemopen_r, (ptr, buf, size, mode),
 
 #ifndef _REENT_ONLY
 FILE *
-_DEFUN(fmemopen, (buf, size, mode),
-       void *__restrict buf,
+fmemopen (void *__restrict buf,
        size_t size,
        const char *__restrict mode)
 {
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 57268945f..022992b8d 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -113,8 +113,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include "local.h"
 
 FILE *
-_DEFUN(_fopen_r, (ptr, file, mode),
-       struct _reent *ptr,
+_fopen_r (struct _reent *ptr,
        const char *__restrict file,
        const char *__restrict mode)
 {
@@ -163,8 +162,7 @@ _DEFUN(_fopen_r, (ptr, file, mode),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN(fopen, (file, mode),
-       const char *file,
+fopen (const char *file,
        const char *mode)
 {
   return _fopen_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio/fopencookie.c b/newlib/libc/stdio/fopencookie.c
index 4ea1ab1d1..0861528e0 100644
--- a/newlib/libc/stdio/fopencookie.c
+++ b/newlib/libc/stdio/fopencookie.c
@@ -98,8 +98,7 @@ typedef struct fccookie {
 } fccookie;
 
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(fcreader, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+fcreader (struct _reent *ptr,
        void *cookie,
        char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -113,8 +112,7 @@ _DEFUN(fcreader, (ptr, cookie, buf, n),
 }
 
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(fcwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+fcwriter (struct _reent *ptr,
        void *cookie,
        const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -136,8 +134,7 @@ _DEFUN(fcwriter, (ptr, cookie, buf, n),
 }
 
 static _fpos_t
-_DEFUN(fcseeker, (ptr, cookie, pos, whence),
-       struct _reent *ptr,
+fcseeker (struct _reent *ptr,
        void *cookie,
        _fpos_t pos,
        int whence)
@@ -164,8 +161,7 @@ _DEFUN(fcseeker, (ptr, cookie, pos, whence),
 
 #ifdef __LARGE64_FILES
 static _fpos64_t
-_DEFUN(fcseeker64, (ptr, cookie, pos, whence),
-       struct _reent *ptr,
+fcseeker64 (struct _reent *ptr,
        void *cookie,
        _fpos64_t pos,
        int whence)
@@ -180,8 +176,7 @@ _DEFUN(fcseeker64, (ptr, cookie, pos, whence),
 #endif /* __LARGE64_FILES */
 
 static int
-_DEFUN(fccloser, (ptr, cookie),
-       struct _reent *ptr,
+fccloser (struct _reent *ptr,
        void *cookie)
 {
   int result = 0;
@@ -197,8 +192,7 @@ _DEFUN(fccloser, (ptr, cookie),
 }
 
 FILE *
-_DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
-       struct _reent *ptr,
+_fopencookie_r (struct _reent *ptr,
        void *cookie,
        const char *mode,
        cookie_io_functions_t functions)
@@ -253,8 +247,7 @@ _DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
 
 #ifndef _REENT_ONLY
 FILE *
-_DEFUN(fopencookie, (cookie, mode, functions),
-       void *cookie,
+fopencookie (void *cookie,
        const char *mode,
        cookie_io_functions_t functions)
 {
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 9dab2cd19..4c03b1a02 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -22,8 +22,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN(_fprintf_r, (ptr, fp, fmt),
-       struct _reent *ptr,
+_fprintf_r (struct _reent *ptr,
        FILE *__restrict fp,
        const char *__restrict fmt, ...)
 {
@@ -45,8 +44,7 @@ _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fprintf, (fp, fmt),
-       FILE *__restrict fp,
+fprintf (FILE *__restrict fp,
        const char *__restrict fmt, ...)
 {
   int ret;
diff --git a/newlib/libc/stdio/fpurge.c b/newlib/libc/stdio/fpurge.c
index acd177a69..2e4f61ec9 100644
--- a/newlib/libc/stdio/fpurge.c
+++ b/newlib/libc/stdio/fpurge.c
@@ -60,8 +60,7 @@ No supporting OS subroutines are required.
 /* Discard I/O from a single file.  */
 
 int
-_DEFUN(_fpurge_r, (ptr, fp),
-       struct _reent *ptr,
+_fpurge_r (struct _reent *ptr,
        register FILE * fp)
 {
   int t;
@@ -93,8 +92,7 @@ _DEFUN(_fpurge_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fpurge, (fp),
-       register FILE * fp)
+fpurge (register FILE * fp)
 {
   return _fpurge_r (_REENT, fp);
 }
@@ -102,8 +100,7 @@ _DEFUN(fpurge, (fp),
 #ifndef __rtems__
 
 void
-_DEFUN(__fpurge, (fp),
-       register FILE * fp)
+__fpurge (register FILE * fp)
 {
   _fpurge_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index 452bb2961..1385cadea 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -87,8 +87,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 int
-_DEFUN(_fputc_r, (ptr, ch, file),
-       struct _reent *ptr,
+_fputc_r (struct _reent *ptr,
        int ch,
        FILE * file)
 {
@@ -102,8 +101,7 @@ _DEFUN(_fputc_r, (ptr, ch, file),
 
 #ifndef _REENT_ONLY
 int
-_DEFUN(fputc, (ch, file),
-       int ch,
+fputc (int ch,
        FILE * file)
 {
 #if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
diff --git a/newlib/libc/stdio/fputc_u.c b/newlib/libc/stdio/fputc_u.c
index 27690e213..9e16069bc 100644
--- a/newlib/libc/stdio/fputc_u.c
+++ b/newlib/libc/stdio/fputc_u.c
@@ -29,8 +29,7 @@
 #include "local.h"
 
 int
-_DEFUN(_fputc_unlocked_r, (ptr, ch, file),
-       struct _reent *ptr,
+_fputc_unlocked_r (struct _reent *ptr,
        int ch,
        FILE * file)
 {
@@ -40,8 +39,7 @@ _DEFUN(_fputc_unlocked_r, (ptr, ch, file),
 
 #ifndef _REENT_ONLY
 int
-_DEFUN(fputc_unlocked, (ch, file),
-       int ch,
+fputc_unlocked (int ch,
        FILE * file)
 {
 #if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 0fd051bad..7a1eadb12 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -86,8 +86,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  * Write the given string to the given file.
  */
 int
-_DEFUN(_fputs_r, (ptr, s, fp),
-       struct _reent * ptr,
+_fputs_r (struct _reent * ptr,
        char const *__restrict s,
        FILE *__restrict fp)
 {
@@ -135,8 +134,7 @@ error:
 
 #ifndef _REENT_ONLY
 int
-_DEFUN(fputs, (s, fp),
-       char const *__restrict s,
+fputs (char const *__restrict s,
        FILE *__restrict fp)
 {
   return _fputs_r (_REENT, s, fp);
diff --git a/newlib/libc/stdio/fputwc.c b/newlib/libc/stdio/fputwc.c
index 4943cef99..9a4e80d52 100644
--- a/newlib/libc/stdio/fputwc.c
+++ b/newlib/libc/stdio/fputwc.c
@@ -128,8 +128,7 @@ PORTABILITY
 #include "local.h"
 
 wint_t
-_DEFUN(__fputwc, (ptr, wc, fp),
-	struct _reent *ptr,
+__fputwc (struct _reent *ptr,
 	wchar_t wc,
 	FILE *fp)
 {
@@ -163,8 +162,7 @@ _DEFUN(__fputwc, (ptr, wc, fp),
 }
 
 wint_t
-_DEFUN(_fputwc_r, (ptr, wc, fp),
-	struct _reent *ptr,
+_fputwc_r (struct _reent *ptr,
 	wchar_t wc,
 	FILE *fp)
 {
@@ -178,8 +176,7 @@ _DEFUN(_fputwc_r, (ptr, wc, fp),
 }
 
 wint_t
-_DEFUN(fputwc, (wc, fp),
-	wchar_t wc,
+fputwc (wchar_t wc,
 	FILE *fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputwc_u.c b/newlib/libc/stdio/fputwc_u.c
index 4d4f07a0a..d4e51532a 100644
--- a/newlib/libc/stdio/fputwc_u.c
+++ b/newlib/libc/stdio/fputwc_u.c
@@ -30,8 +30,7 @@
 #include "local.h"
 
 wint_t
-_DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
-	struct _reent *ptr,
+_fputwc_unlocked_r (struct _reent *ptr,
 	wchar_t wc,
 	FILE *fp)
 {
@@ -40,8 +39,7 @@ _DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
 }
 
 wint_t
-_DEFUN(fputwc_unlocked, (wc, fp),
-	wchar_t wc,
+fputwc_unlocked (wchar_t wc,
 	FILE *fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputws.c b/newlib/libc/stdio/fputws.c
index 8a470fcfb..92f2cbf6a 100644
--- a/newlib/libc/stdio/fputws.c
+++ b/newlib/libc/stdio/fputws.c
@@ -94,8 +94,7 @@ PORTABILITY
 #endif
 
 int
-_DEFUN(_fputws_r, (ptr, ws, fp),
-	struct _reent *ptr,
+_fputws_r (struct _reent *ptr,
 	const wchar_t *ws,
 	FILE *fp)
 {
@@ -158,8 +157,7 @@ error:
 }
 
 int
-_DEFUN(fputws, (ws, fp),
-	const wchar_t *__restrict ws,
+fputws (const wchar_t *__restrict ws,
 	FILE *__restrict fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index c9180b833..b358d2b4a 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -93,8 +93,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 #ifdef __SCLE
 static size_t
-_DEFUN(crlf_r, (ptr, fp, buf, count, eof),
-       struct _reent * ptr,
+crlf_r (struct _reent * ptr,
        FILE * fp,
        char * buf,
        size_t count,
@@ -142,8 +141,7 @@ _DEFUN(crlf_r, (ptr, fp, buf, count, eof),
 #endif
 
 size_t
-_DEFUN(_fread_r, (ptr, buf, size, count, fp),
-       struct _reent * ptr,
+_fread_r (struct _reent * ptr,
        void *__restrict buf,
        size_t size,
        size_t count,
@@ -260,8 +258,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN(fread, (buf, size, count, fp),
-       void *__restrict  buf,
+fread (void *__restrict  buf,
        size_t size,
        size_t count,
        FILE *__restrict fp)
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index 46cbd81ce..0af1c1ecd 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -75,8 +75,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 FILE *
-_DEFUN(_freopen_r, (ptr, file, mode, fp),
-       struct _reent *ptr,
+_freopen_r (struct _reent *ptr,
        const char *__restrict file,
        const char *__restrict mode,
        register FILE *__restrict fp)
@@ -243,8 +242,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN(freopen, (file, mode, fp),
-       const char *__restrict file,
+freopen (const char *__restrict file,
        const char *__restrict mode,
        register FILE *__restrict fp)
 {
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index 4b8a1e099..9b3ea986c 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -81,8 +81,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 int
-_DEFUN(_fseek_r, (ptr, fp, offset, whence),
-       struct _reent *ptr,
+_fseek_r (struct _reent *ptr,
        register FILE *fp,
        long offset,
        int whence)
@@ -93,8 +92,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fseek, (fp, offset, whence),
-       register FILE *fp,
+fseek (register FILE *fp,
        long offset,
        int whence)
 {
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index a2ed1b5b5..7ca86161c 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -93,8 +93,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 int
-_DEFUN(_fseeko_r, (ptr, fp, offset, whence),
-       struct _reent *ptr,
+_fseeko_r (struct _reent *ptr,
        register FILE *fp,
        _off_t offset,
        int whence)
@@ -359,8 +358,7 @@ dumb:
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fseeko, (fp, offset, whence),
-       register FILE *fp,
+fseeko (register FILE *fp,
        _off_t offset,
        int whence)
 {
diff --git a/newlib/libc/stdio/fsetlocking.c b/newlib/libc/stdio/fsetlocking.c
index e27aa42fc..062b93a92 100644
--- a/newlib/libc/stdio/fsetlocking.c
+++ b/newlib/libc/stdio/fsetlocking.c
@@ -65,8 +65,7 @@ No supporting OS subroutines are required.
 #include "local.h"
 
 int
-_DEFUN(__fsetlocking, (fp, type),
-       FILE * fp,
+__fsetlocking (FILE * fp,
        int type)
 {
   int result;
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index d765081a6..b5334e251 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -59,8 +59,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <stdio.h>
 
 int
-_DEFUN(_fsetpos_r, (ptr, iop, pos),
-       struct _reent * ptr,
+_fsetpos_r (struct _reent * ptr,
        FILE * iop,
        const _fpos_t * pos)
 {
@@ -74,8 +73,7 @@ _DEFUN(_fsetpos_r, (ptr, iop, pos),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fsetpos, (iop, pos),
-       FILE * iop,
+fsetpos (FILE * iop,
        const _fpos_t * pos)
 {
   return _fsetpos_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c
index 1260d5ef4..e4a246199 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -83,8 +83,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include "local.h"
 
 long
-_DEFUN(_ftell_r, (ptr, fp),
-       struct _reent *ptr,
+_ftell_r (struct _reent *ptr,
        register FILE * fp)
 {
   _fpos_t pos;
@@ -101,8 +100,7 @@ _DEFUN(_ftell_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 long
-_DEFUN(ftell, (fp),
-       register FILE * fp)
+ftell (register FILE * fp)
 {
   return _ftell_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index 19299c3ad..22af82de8 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -83,8 +83,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include "local.h"
 
 _off_t
-_DEFUN(_ftello_r, (ptr, fp),
-       struct _reent * ptr,
+_ftello_r (struct _reent * ptr,
        register FILE * fp)
 {
   _fpos_t pos;
@@ -147,8 +146,7 @@ _DEFUN(_ftello_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 _off_t
-_DEFUN(ftello, (fp),
-       register FILE * fp)
+ftello (register FILE * fp)
 {
   return _ftello_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio/funopen.c b/newlib/libc/stdio/funopen.c
index 23bed7b8e..a1c0d767d 100644
--- a/newlib/libc/stdio/funopen.c
+++ b/newlib/libc/stdio/funopen.c
@@ -104,8 +104,7 @@ typedef struct funcookie {
 } funcookie;
 
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(funreader, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+funreader (struct _reent *ptr,
        void *cookie,
        char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -119,8 +118,7 @@ _DEFUN(funreader, (ptr, cookie, buf, n),
 }
 
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(funwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+funwriter (struct _reent *ptr,
        void *cookie,
        const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -134,8 +132,7 @@ _DEFUN(funwriter, (ptr, cookie, buf, n),
 }
 
 static _fpos_t
-_DEFUN(funseeker, (ptr, cookie, off, whence),
-       struct _reent *ptr,
+funseeker (struct _reent *ptr,
        void *cookie,
        _fpos_t off,
        int whence)
@@ -162,8 +159,7 @@ _DEFUN(funseeker, (ptr, cookie, off, whence),
 
 #ifdef __LARGE64_FILES
 static _fpos64_t
-_DEFUN(funseeker64, (ptr, cookie, off, whence),
-       struct _reent *ptr,
+funseeker64 (struct _reent *ptr,
        void *cookie,
        _fpos64_t off,
        int whence)
@@ -178,8 +174,7 @@ _DEFUN(funseeker64, (ptr, cookie, off, whence),
 #endif /* __LARGE64_FILES */
 
 static int
-_DEFUN(funcloser, (ptr, cookie),
-       struct _reent *ptr,
+funcloser (struct _reent *ptr,
        void *cookie)
 {
   int result = 0;
@@ -195,8 +190,7 @@ _DEFUN(funcloser, (ptr, cookie),
 }
 
 FILE *
-_DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
-       struct _reent *ptr,
+_funopen_r (struct _reent *ptr,
        const void *cookie,
        funread readfn,
        funwrite writefn,
@@ -267,8 +261,7 @@ _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
 
 #ifndef _REENT_ONLY
 FILE *
-_DEFUN(funopen, (cookie, readfn, writefn, seekfn, closefn),
-       const void *cookie,
+funopen (const void *cookie,
        funread readfn,
        funwrite writefn,
        funseek seekfn,
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index d742784e5..3e3a0c6a2 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -45,8 +45,7 @@
  */
 
 int
-_DEFUN(__sfvwrite_r, (ptr, fp, uio),
-       struct _reent *ptr,
+__sfvwrite_r (struct _reent *ptr,
        register FILE *fp,
        register struct __suio *uio)
 {
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index 8b7b5b0e3..b4b285a64 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -28,8 +28,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include "local.h"
 
 int
-_DEFUN(_fwalk, (ptr, function),
-       struct _reent *ptr,
+_fwalk (struct _reent *ptr,
        register int (*function) (FILE *))
 {
   register FILE *fp;
@@ -55,8 +54,7 @@ _DEFUN(_fwalk, (ptr, function),
 /* Special version of __fwalk where the function pointer is a reentrant
    I/O function (e.g. _fclose_r).  */
 int
-_DEFUN(_fwalk_reent, (ptr, reent_function),
-       struct _reent *ptr,
+_fwalk_reent (struct _reent *ptr,
        register int (*reent_function) (struct _reent *, FILE *))
 {
   register FILE *fp;
diff --git a/newlib/libc/stdio/fwide.c b/newlib/libc/stdio/fwide.c
index 719a58acd..9b5a3d12a 100644
--- a/newlib/libc/stdio/fwide.c
+++ b/newlib/libc/stdio/fwide.c
@@ -48,8 +48,7 @@ C99, POSIX.1-2001.
 #include "local.h"
 
 int
-_DEFUN(_fwide_r, (ptr, fp, mode),
-	struct _reent *ptr,
+_fwide_r (struct _reent *ptr,
 	FILE *fp,
 	int mode)
 {
@@ -70,8 +69,7 @@ _DEFUN(_fwide_r, (ptr, fp, mode),
 }
 
 int
-_DEFUN(fwide, (fp, mode),
-	FILE *fp,
+fwide (FILE *fp,
 	int mode)
 {
   return _fwide_r (_REENT, fp, mode);
diff --git a/newlib/libc/stdio/fwprintf.c b/newlib/libc/stdio/fwprintf.c
index b7604aafe..d4047dcc4 100644
--- a/newlib/libc/stdio/fwprintf.c
+++ b/newlib/libc/stdio/fwprintf.c
@@ -23,8 +23,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN(_fwprintf_r, (ptr, fp, fmt),
-       struct _reent *ptr,
+_fwprintf_r (struct _reent *ptr,
        FILE *fp,
        const wchar_t *fmt, ...)
 {
@@ -40,8 +39,7 @@ _DEFUN(_fwprintf_r, (ptr, fp, fmt),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(fwprintf, (fp, fmt),
-       FILE *__restrict fp,
+fwprintf (FILE *__restrict fp,
        const wchar_t *__restrict fmt, ...)
 {
   int ret;
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 7dec80c1a..aa14421db 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -108,8 +108,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 size_t
-_DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
-       struct _reent * ptr,
+_fwrite_r (struct _reent * ptr,
        const void *__restrict buf,
        size_t size,
        size_t count,
@@ -170,8 +169,7 @@ ret:
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN(fwrite, (buf, size, count, fp),
-       const void *__restrict buf,
+fwrite (const void *__restrict buf,
        size_t size,
        size_t count,
        FILE * fp)
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 269bfb1d3..3c62f0bd9 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -76,8 +76,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef getc
 
 int
-_DEFUN(_getc_r, (ptr, fp),
-       struct _reent *ptr,
+_getc_r (struct _reent *ptr,
        register FILE *fp)
 {
   int result;
@@ -91,8 +90,7 @@ _DEFUN(_getc_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(getc, (fp),
-       register FILE *fp)
+getc (register FILE *fp)
 {
   int result;
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
index 2f9f0e818..fb37ba4b1 100644
--- a/newlib/libc/stdio/getc_u.c
+++ b/newlib/libc/stdio/getc_u.c
@@ -69,8 +69,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef getc_unlocked
 
 int
-_DEFUN(_getc_unlocked_r, (ptr, fp),
-       struct _reent *ptr,
+_getc_unlocked_r (struct _reent *ptr,
        register FILE *fp)
 {
   /* CHECK_INIT is called (eventually) by __srefill_r.  */
@@ -81,8 +80,7 @@ _DEFUN(_getc_unlocked_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(getc_unlocked, (fp),
-       register FILE *fp)
+getc_unlocked (register FILE *fp)
 {
   return __sgetc_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c
index b3ca289ba..7e0b74848 100644
--- a/newlib/libc/stdio/getchar.c
+++ b/newlib/libc/stdio/getchar.c
@@ -72,8 +72,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef getchar
 
 int
-_DEFUN(_getchar_r, (reent),
-       struct _reent *reent)
+_getchar_r (struct _reent *reent)
 {
   _REENT_SMALL_CHECK_INIT (reent);
   return _getc_r (reent, _stdin_r (reent));
diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c
index 5848d47ac..e45176dfa 100644
--- a/newlib/libc/stdio/getchar_u.c
+++ b/newlib/libc/stdio/getchar_u.c
@@ -70,8 +70,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef getchar_unlocked
 
 int
-_DEFUN(_getchar_unlocked_r, (ptr),
-       struct _reent *ptr)
+_getchar_unlocked_r (struct _reent *ptr)
 {
   return _getc_unlocked_r (ptr, _stdin_r (ptr));
 }
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
index 4164be5c5..90cd5d47f 100644
--- a/newlib/libc/stdio/getdelim.c
+++ b/newlib/libc/stdio/getdelim.c
@@ -40,8 +40,7 @@ No supporting OS subroutines are directly required.
 #define DEFAULT_LINE_SIZE 128
 
 ssize_t
-_DEFUN(__getdelim, (bufptr, n, delim, fp),
-       char **bufptr,
+__getdelim (char **bufptr,
        size_t *n,
        int delim,
        FILE *fp)
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index b212a8c8f..857e980ad 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -37,8 +37,7 @@ No supporting OS subroutines are directly required.
 extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
 
 ssize_t
-_DEFUN(__getline, (lptr, n, fp),
-       char **lptr,
+__getline (char **lptr,
        size_t *n,
        FILE *fp)
 {
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index 4e951efe3..a510ec0f0 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -63,8 +63,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 char *
-_DEFUN(_gets_r, (ptr, buf),
-       struct _reent *ptr,
+_gets_r (struct _reent *ptr,
        char *buf)
 {
   register int c;
@@ -94,8 +93,7 @@ _DEFUN(_gets_r, (ptr, buf),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(gets, (buf),
-       char *buf)
+gets (char *buf)
 {
   return _gets_r (_REENT, buf);
 }
diff --git a/newlib/libc/stdio/getw.c b/newlib/libc/stdio/getw.c
index 4585d9f37..a1b72e482 100644
--- a/newlib/libc/stdio/getw.c
+++ b/newlib/libc/stdio/getw.c
@@ -54,8 +54,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <stdio.h>
 
 int
-_DEFUN(getw, (fp),
-       register FILE *fp)
+getw (register FILE *fp)
 {
   int result;
   if (fread ((char*)&result, sizeof (result), 1, fp) != 1)
diff --git a/newlib/libc/stdio/getwc.c b/newlib/libc/stdio/getwc.c
index db9a43768..15b397455 100644
--- a/newlib/libc/stdio/getwc.c
+++ b/newlib/libc/stdio/getwc.c
@@ -33,8 +33,7 @@
 #undef getwc
 
 wint_t
-_DEFUN(_getwc_r, (ptr, fp),
-	struct _reent *ptr,
+_getwc_r (struct _reent *ptr,
 	FILE *fp)
 {
   return _fgetwc_r (ptr, fp);
@@ -45,8 +44,7 @@ _DEFUN(_getwc_r, (ptr, fp),
  * macro, may evaluate `fp' more than once.
  */
 wint_t
-_DEFUN(getwc, (fp),
-	FILE *fp)
+getwc (FILE *fp)
 {
   return fgetwc(fp);
 }
diff --git a/newlib/libc/stdio/getwc_u.c b/newlib/libc/stdio/getwc_u.c
index 913c3e08b..366ab0f36 100644
--- a/newlib/libc/stdio/getwc_u.c
+++ b/newlib/libc/stdio/getwc_u.c
@@ -34,8 +34,7 @@
 #undef getwc_unlocked
 
 wint_t
-_DEFUN(_getwc_unlocked_r, (ptr, fp),
-	struct _reent *ptr,
+_getwc_unlocked_r (struct _reent *ptr,
 	FILE *fp)
 {
   return _fgetwc_unlocked_r (ptr, fp);
@@ -46,8 +45,7 @@ _DEFUN(_getwc_unlocked_r, (ptr, fp),
  * a macro, may evaluate `fp' more than once.
  */
 wint_t
-_DEFUN(getwc_unlocked, (fp),
-	FILE *fp)
+getwc_unlocked (FILE *fp)
 {
   return fgetwc_unlocked(fp);
 }
diff --git a/newlib/libc/stdio/getwchar.c b/newlib/libc/stdio/getwchar.c
index f432755a0..148539241 100644
--- a/newlib/libc/stdio/getwchar.c
+++ b/newlib/libc/stdio/getwchar.c
@@ -93,8 +93,7 @@ PORTABILITY
 #undef getwchar
 
 wint_t
-_DEFUN (_getwchar_r, (ptr),
-	struct _reent *ptr)
+_getwchar_r (struct _reent *ptr)
 {
   return _fgetwc_r (ptr, stdin);
 }
diff --git a/newlib/libc/stdio/getwchar_u.c b/newlib/libc/stdio/getwchar_u.c
index 4c854f213..c1f8d2da5 100644
--- a/newlib/libc/stdio/getwchar_u.c
+++ b/newlib/libc/stdio/getwchar_u.c
@@ -34,8 +34,7 @@
 #undef getwchar_unlocked
 
 wint_t
-_DEFUN (_getwchar_unlocked_r, (ptr),
-	struct _reent *ptr)
+_getwchar_unlocked_r (struct _reent *ptr)
 {
   return _fgetwc_unlocked_r (ptr, stdin);
 }
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index 571d826e5..507d15415 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -25,8 +25,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(iprintf, (fmt),
-       const char *fmt, ...)
+iprintf (const char *fmt, ...)
 {
   int ret;
   va_list ap;
@@ -42,8 +41,7 @@ _DEFUN(iprintf, (fmt),
 #endif /* ! _REENT_ONLY */
 
 int
-_DEFUN(_iprintf_r, (ptr, fmt),
-       struct _reent *ptr,
+_iprintf_r (struct _reent *ptr,
        const char *fmt, ...)
 {
   int ret;
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index 37a50d47d..f2da70ad6 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -35,8 +35,7 @@
  */
 
 void
-_DEFUN(__smakebuf_r, (ptr, fp),
-       struct _reent *ptr,
+__smakebuf_r (struct _reent *ptr,
        register FILE *fp)
 {
   register void *p;
@@ -76,8 +75,7 @@ _DEFUN(__smakebuf_r, (ptr, fp),
  * Internal routine to determine `proper' buffering for a file.
  */
 int
-_DEFUN(__swhatbuf_r, (ptr, fp, bufsize, couldbetty),
-	struct _reent *ptr,
+__swhatbuf_r (struct _reent *ptr,
 	FILE *fp,
 	size_t *bufsize,
 	int *couldbetty)
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 37092496b..9b85eb93e 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -139,8 +139,7 @@ Supporting OS subroutines required: <<getpid>>, <<mkdir>>, <<open>>, <<stat>>.
 #include <ctype.h>
 
 static int
-_DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
-       struct _reent *ptr,
+_gettemp (struct _reent *ptr,
        char *path,
        register int *doopen,
        int domkdir,
@@ -263,8 +262,7 @@ _DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
 #endif
 
 int
-_DEFUN(_mkstemp_r, (ptr, path),
-       struct _reent *ptr,
+_mkstemp_r (struct _reent *ptr,
        char *path)
 {
   int fd;
@@ -274,16 +272,14 @@ _DEFUN(_mkstemp_r, (ptr, path),
 
 #if !defined _ELIX_LEVEL || _ELIX_LEVEL >= 4
 char *
-_DEFUN(_mkdtemp_r, (ptr, path),
-       struct _reent *ptr,
+_mkdtemp_r (struct _reent *ptr,
        char *path)
 {
   return (_gettemp (ptr, path, (int *) NULL, 1, 0, 0) ? path : NULL);
 }
 
 int
-_DEFUN(_mkstemps_r, (ptr, path, len),
-       struct _reent *ptr,
+_mkstemps_r (struct _reent *ptr,
        char *path,
        int len)
 {
@@ -293,8 +289,7 @@ _DEFUN(_mkstemps_r, (ptr, path, len),
 }
 
 int
-_DEFUN(_mkostemp_r, (ptr, path, flags),
-       struct _reent *ptr,
+_mkostemp_r (struct _reent *ptr,
        char *path,
        int flags)
 {
@@ -304,8 +299,7 @@ _DEFUN(_mkostemp_r, (ptr, path, flags),
 }
 
 int
-_DEFUN(_mkostemps_r, (ptr, path, len, flags),
-       struct _reent *ptr,
+_mkostemps_r (struct _reent *ptr,
        char *path,
        int len,
        int flags)
@@ -317,8 +311,7 @@ _DEFUN(_mkostemps_r, (ptr, path, len, flags),
 #endif /* _ELIX_LEVEL */
 
 char *
-_DEFUN(_mktemp_r, (ptr, path),
-       struct _reent *ptr,
+_mktemp_r (struct _reent *ptr,
        char *path)
 {
   return (_gettemp (ptr, path, (int *) NULL, 0, 0, 0) ? path : (char *) NULL);
@@ -327,8 +320,7 @@ _DEFUN(_mktemp_r, (ptr, path),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(mkstemp, (path),
-       char *path)
+mkstemp (char *path)
 {
   int fd;
 
@@ -337,15 +329,13 @@ _DEFUN(mkstemp, (path),
 
 # if !defined _ELIX_LEVEL || _ELIX_LEVEL >= 4
 char *
-_DEFUN(mkdtemp, (path),
-       char *path)
+mkdtemp (char *path)
 {
   return (_gettemp (_REENT, path, (int *) NULL, 1, 0, 0) ? path : NULL);
 }
 
 int
-_DEFUN(mkstemps, (path, len),
-       char *path,
+mkstemps (char *path,
        int len)
 {
   int fd;
@@ -354,8 +344,7 @@ _DEFUN(mkstemps, (path, len),
 }
 
 int
-_DEFUN(mkostemp, (path, flags),
-       char *path,
+mkostemp (char *path,
        int flags)
 {
   int fd;
@@ -364,8 +353,7 @@ _DEFUN(mkostemp, (path, flags),
 }
 
 int
-_DEFUN(mkostemps, (path, len, flags),
-       char *path,
+mkostemps (char *path,
        int len,
        int flags)
 {
@@ -376,8 +364,7 @@ _DEFUN(mkostemps, (path, len, flags),
 # endif /* _ELIX_LEVEL */
 
 char *
-_DEFUN(mktemp, (path),
-       char *path)
+mktemp (char *path)
 {
   return (_gettemp (_REENT, path, (int *) NULL, 0, 0, 0) ? path : (char *) NULL);
 }
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 58359dd4a..623afb732 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -172,8 +172,7 @@ static char *rcsid = "$Id$";
    and vfwprintf.  */
 #ifdef STRING_ONLY
 int
-_DEFUN(__ssputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr,
+__ssputs_r (struct _reent *ptr,
        FILE *fp,
        const char *buf,
        size_t len)
@@ -243,8 +242,7 @@ err:
    char output, but __ssprint_r cannot be discarded because it is used
    by a serial of functions like svfwprintf for wide char output.  */
 int
-_DEFUN(__ssprint_r, (ptr, fp, uio),
-       struct _reent *ptr,
+__ssprint_r (struct _reent *ptr,
        FILE *fp,
        register struct __suio *uio)
 {
@@ -347,8 +345,7 @@ err:
 /* Flush out all the vectors defined by the given uio,
    then reset it so that it can be reused.  */
 int
-_DEFUN(__sprint_r, (ptr, fp, uio),
-       struct _reent *ptr,
+__sprint_r (struct _reent *ptr,
        FILE *fp,
        register struct __suio *uio)
 {
@@ -392,8 +389,7 @@ out:
 }
 
 _NOINLINE_STATIC int
-_DEFUN(__sfputc_r, (ptr, c, fp),
-       struct _reent *ptr,
+__sfputc_r (struct _reent *ptr,
        int c,
        FILE *fp)
 {
@@ -404,8 +400,7 @@ _DEFUN(__sfputc_r, (ptr, c, fp),
 }
 
 int
-_DEFUN(__sfputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr,
+__sfputs_r (struct _reent *ptr,
        FILE *fp,
        const char *buf,
        size_t len)
@@ -442,8 +437,7 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
 
 #ifndef STRING_ONLY
 int
-_DEFUN(VFPRINTF, (fp, fmt0, ap),
-       FILE * fp,
+VFPRINTF (FILE * fp,
        const char *fmt0,
        va_list ap)
 {
@@ -471,8 +465,7 @@ _EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
 #endif
 
 int
-_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data,
+_VFPRINTF_R (struct _reent *data,
        FILE * fp,
        const char *fmt0,
        va_list ap)
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 553fc22cb..fe4845264 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -135,8 +135,7 @@ Supporting OS subroutines required:
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(VFSCANF, (fp, fmt, ap),
-       register FILE *fp,
+VFSCANF (register FILE *fp,
        const char *fmt,
        va_list ap)
 {
@@ -149,8 +148,7 @@ _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
        _ATTRIBUTE ((__alias__("vfscanf"))));
 
 int
-_DEFUN(__SVFSCANF, (fp, fmt0, ap),
-       register FILE *fp,
+__SVFSCANF (register FILE *fp,
        char const *fmt0,
        va_list ap)
 {
@@ -160,8 +158,7 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
 #endif
 
 int
-_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data,
+_VFSCANF_R (struct _reent *data,
        register FILE *fp,
        const char *fmt,
        va_list ap)
@@ -180,8 +177,7 @@ _EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
    regular ungetc which will drag in file I/O items we don't need.
    So, we create our own trimmed-down version.  */
 int
-_DEFUN(_sungetc_r, (data, fp, ch),
-	struct _reent *data,
+_sungetc_r (struct _reent *data,
 	int c,
 	register FILE *fp)
 {
@@ -229,8 +225,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
 
 /* String only version of __srefill_r for sscanf family.  */
 int
-_DEFUN(__ssrefill_r, (ptr, fp),
-       struct _reent * ptr,
+__ssrefill_r (struct _reent * ptr,
        register FILE * fp)
 {
   /* Our only hope of further input is the ungetc buffer.
@@ -259,8 +254,7 @@ size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
 #endif /* !STRING_ONLY.  */
 
 int
-_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr,
+__SVFSCANF_R (struct _reent *rptr,
        register FILE *fp,
        char const *fmt0,
        va_list ap)
diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c
index 5dd64115b..afa4a6d62 100644
--- a/newlib/libc/stdio/open_memstream.c
+++ b/newlib/libc/stdio/open_memstream.c
@@ -93,8 +93,7 @@ typedef struct memstream {
 /* Write up to non-zero N bytes of BUF into the stream described by COOKIE,
    returning the number of bytes written or EOF on failure.  */
 static _READ_WRITE_RETURN_TYPE
-_DEFUN(memwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+memwriter (struct _reent *ptr,
        void *cookie,
        const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -147,8 +146,7 @@ _DEFUN(memwriter, (ptr, cookie, buf, n),
 /* Seek to position POS relative to WHENCE within stream described by
    COOKIE; return resulting position or fail with EOF.  */
 static _fpos_t
-_DEFUN(memseeker, (ptr, cookie, pos, whence),
-       struct _reent *ptr,
+memseeker (struct _reent *ptr,
        void *cookie,
        _fpos_t pos,
        int whence)
@@ -215,8 +213,7 @@ _DEFUN(memseeker, (ptr, cookie, pos, whence),
    COOKIE; return resulting position or fail with EOF.  */
 #ifdef __LARGE64_FILES
 static _fpos64_t
-_DEFUN(memseeker64, (ptr, cookie, pos, whence),
-       struct _reent *ptr,
+memseeker64 (struct _reent *ptr,
        void *cookie,
        _fpos64_t pos,
        int whence)
@@ -275,8 +272,7 @@ _DEFUN(memseeker64, (ptr, cookie, pos, whence),
 
 /* Reclaim resources used by stream described by COOKIE.  */
 static int
-_DEFUN(memcloser, (ptr, cookie),
-       struct _reent *ptr,
+memcloser (struct _reent *ptr,
        void *cookie)
 {
   memstream *c = (memstream *) cookie;
@@ -295,8 +291,7 @@ _DEFUN(memcloser, (ptr, cookie),
 /* Open a memstream that tracks a dynamic buffer in BUF and SIZE.
    Return the new stream, or fail with NULL.  */
 static FILE *
-_DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
-       struct _reent *ptr,
+internal_open_memstream_r (struct _reent *ptr,
        char **buf,
        size_t *size,
        int wide)
@@ -378,8 +373,7 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
 }
 
 FILE *
-_DEFUN(_open_memstream_r, (ptr, buf, size),
-       struct _reent *ptr,
+_open_memstream_r (struct _reent *ptr,
        char **buf,
        size_t *size)
 {
@@ -387,8 +381,7 @@ _DEFUN(_open_memstream_r, (ptr, buf, size),
 }
 
 FILE *
-_DEFUN(_open_wmemstream_r, (ptr, buf, size),
-       struct _reent *ptr,
+_open_wmemstream_r (struct _reent *ptr,
        wchar_t **buf,
        size_t *size)
 {
@@ -397,16 +390,14 @@ _DEFUN(_open_wmemstream_r, (ptr, buf, size),
 
 #ifndef _REENT_ONLY
 FILE *
-_DEFUN(open_memstream, (buf, size),
-       char **buf,
+open_memstream (char **buf,
        size_t *size)
 {
   return _open_memstream_r (_REENT, buf, size);
 }
 
 FILE *
-_DEFUN(open_wmemstream, (buf, size),
-       wchar_t **buf,
+open_wmemstream (wchar_t **buf,
        size_t *size)
 {
   return _open_wmemstream_r (_REENT, buf, size);
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index e3e70a6f1..d98e17e19 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -59,8 +59,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 void
-_DEFUN(_perror_r, (ptr, s),
-       struct _reent *ptr,
+_perror_r (struct _reent *ptr,
        const char *s)
 {
   char *error;
@@ -82,8 +81,7 @@ _DEFUN(_perror_r, (ptr, s),
 #ifndef _REENT_ONLY
 
 void
-_DEFUN(perror, (s),
-       const char *s)
+perror (const char *s)
 {
   _perror_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index 73986776b..a323f5ad0 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -23,8 +23,7 @@
 #include "local.h"
 
 int
-_DEFUN(_printf_r, (ptr, fmt),
-       struct _reent *ptr,
+_printf_r (struct _reent *ptr,
        const char *__restrict fmt, ...)
 {
   int ret;
@@ -46,8 +45,7 @@ _EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(printf, (fmt),
-       const char *__restrict fmt, ...)
+printf (const char *__restrict fmt, ...)
 {
   int ret;
   va_list ap;
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index e69841d17..d4adc5a50 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -78,8 +78,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef putc
 
 int
-_DEFUN(_putc_r, (ptr, c, fp),
-       struct _reent *ptr,
+_putc_r (struct _reent *ptr,
        int c,
        register FILE *fp)
 {
@@ -93,8 +92,7 @@ _DEFUN(_putc_r, (ptr, c, fp),
 
 #ifndef _REENT_ONLY
 int
-_DEFUN(putc, (c, fp),
-       int c,
+putc (int c,
        register FILE *fp)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c
index b53060bed..de4ac2833 100644
--- a/newlib/libc/stdio/putc_u.c
+++ b/newlib/libc/stdio/putc_u.c
@@ -70,8 +70,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef putc_unlocked
 
 int
-_DEFUN(_putc_unlocked_r, (ptr, c, fp),
-       struct _reent *ptr,
+_putc_unlocked_r (struct _reent *ptr,
        int c,
        register FILE *fp)
 {
@@ -82,8 +81,7 @@ _DEFUN(_putc_unlocked_r, (ptr, c, fp),
 
 #ifndef _REENT_ONLY
 int
-_DEFUN(putc_unlocked, (c, fp),
-       int c,
+putc_unlocked (int c,
        register FILE *fp)
 {
   /* CHECK_INIT is (eventually) called by __swbuf.  */
diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c
index 813144a2b..c52d38799 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -67,8 +67,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef putchar
 
 int
-_DEFUN(_putchar_r, (ptr, c),
-       struct _reent *ptr,
+_putchar_r (struct _reent *ptr,
        int c)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
@@ -78,8 +77,7 @@ _DEFUN(_putchar_r, (ptr, c),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(putchar, (c),
-       int c)
+putchar (int c)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c
index e0ed8f7d7..8f16bfbc6 100644
--- a/newlib/libc/stdio/putchar_u.c
+++ b/newlib/libc/stdio/putchar_u.c
@@ -61,8 +61,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef putchar_unlocked
 
 int
-_DEFUN(_putchar_unlocked_r, (ptr, c),
-       struct _reent *ptr,
+_putchar_unlocked_r (struct _reent *ptr,
        int c)
 {
   return putc_unlocked (c, _stdout_r (ptr));
@@ -71,8 +70,7 @@ _DEFUN(_putchar_unlocked_r, (ptr, c),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(putchar_unlocked, (c),
-       int c)
+putchar_unlocked (int c)
 {
   /* CHECK_INIT is (eventually) called by __swbuf.  */
 
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 89a9485bb..f612ece6d 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -65,8 +65,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 int
-_DEFUN(_puts_r, (ptr, s),
-       struct _reent *ptr,
+_puts_r (struct _reent *ptr,
        const char * s)
 {
 #ifdef _FVWRITE_IN_STREAMIO
@@ -125,8 +124,7 @@ err:
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(puts, (s),
-       char const * s)
+puts (char const * s)
 {
   return _puts_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 5377d87d3..a7907bef7 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -49,8 +49,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <stdio.h>
 
 int
-_DEFUN(putw, (w, fp),
-       int w,
+putw (int w,
        register FILE *fp)
 {
   if (fwrite ((const char*)&w, sizeof (w), 1, fp) != 1)
diff --git a/newlib/libc/stdio/putwc.c b/newlib/libc/stdio/putwc.c
index 7c31d23d8..a6c3100d7 100644
--- a/newlib/libc/stdio/putwc.c
+++ b/newlib/libc/stdio/putwc.c
@@ -33,8 +33,7 @@
 #undef putwc
 
 wint_t
-_DEFUN(_putwc_r, (ptr, wc, fp),
-	struct _reent *ptr,
+_putwc_r (struct _reent *ptr,
 	wchar_t wc,
 	FILE *fp)
 {
@@ -45,8 +44,7 @@ _DEFUN(_putwc_r, (ptr, wc, fp),
  * macro, may evaluate `fp' more than once.
  */
 wint_t
-_DEFUN(putwc, (wc, fp),
-	wchar_t wc,
+putwc (wchar_t wc,
 	FILE *fp)
 {
   return fputwc (wc, fp);
diff --git a/newlib/libc/stdio/putwc_u.c b/newlib/libc/stdio/putwc_u.c
index cb09fd2db..0ec11f04e 100644
--- a/newlib/libc/stdio/putwc_u.c
+++ b/newlib/libc/stdio/putwc_u.c
@@ -34,8 +34,7 @@
 #undef putwc_unlocked
 
 wint_t
-_DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
-	struct _reent *ptr,
+_putwc_unlocked_r (struct _reent *ptr,
 	wchar_t wc,
 	FILE *fp)
 {
@@ -46,8 +45,7 @@ _DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
  * if it is a macro, may evaluate `fp' more than once.
  */
 wint_t
-_DEFUN(putwc_unlocked, (wc, fp),
-	wchar_t wc,
+putwc_unlocked (wchar_t wc,
 	FILE *fp)
 {
   return fputwc_unlocked (wc, fp);
diff --git a/newlib/libc/stdio/putwchar.c b/newlib/libc/stdio/putwchar.c
index 66ed30ac0..238cb5016 100644
--- a/newlib/libc/stdio/putwchar.c
+++ b/newlib/libc/stdio/putwchar.c
@@ -87,8 +87,7 @@ PORTABILITY
 #undef putwchar
 
 wint_t
-_DEFUN(_putwchar_r, (ptr, wc),
-	struct _reent *ptr,
+_putwchar_r (struct _reent *ptr,
 	wchar_t wc)
 {
   return _fputwc_r (ptr, wc, stdout);
@@ -98,8 +97,7 @@ _DEFUN(_putwchar_r, (ptr, wc),
  * Synonym for fputwc(wc, stdout).
  */
 wint_t
-_DEFUN(putwchar, (wc),
-	wchar_t wc)
+putwchar (wchar_t wc)
 {
   _REENT_SMALL_CHECK_INIT (_REENT);
   return fputwc (wc, stdout);
diff --git a/newlib/libc/stdio/putwchar_u.c b/newlib/libc/stdio/putwchar_u.c
index 68c5abe26..a5e6a57da 100644
--- a/newlib/libc/stdio/putwchar_u.c
+++ b/newlib/libc/stdio/putwchar_u.c
@@ -34,8 +34,7 @@
 #undef putwchar_unlocked
 
 wint_t
-_DEFUN(_putwchar_unlocked_r, (ptr, wc),
-	struct _reent *ptr,
+_putwchar_unlocked_r (struct _reent *ptr,
 	wchar_t wc)
 {
   return _fputwc_unlocked_r (ptr, wc, stdout);
@@ -45,8 +44,7 @@ _DEFUN(_putwchar_unlocked_r, (ptr, wc),
  * Synonym for fputwc_unlocked(wc, stdout).
  */
 wint_t
-_DEFUN(putwchar_unlocked, (wc),
-	wchar_t wc)
+putwchar_unlocked (wchar_t wc)
 {
   _REENT_SMALL_CHECK_INIT (_REENT);
   return fputwc_unlocked (wc, stdout);
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index 6158f3ec0..87a715b84 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -23,8 +23,7 @@
 #include "local.h"
 
 static int
-_DEFUN(lflush, (fp),
-       FILE *fp)
+lflush (FILE *fp)
 {
   if ((fp->_flags & (__SLBF | __SWR)) == (__SLBF | __SWR))
     return fflush (fp);
@@ -37,8 +36,7 @@ _DEFUN(lflush, (fp),
  */
 
 int
-_DEFUN(__srefill_r, (ptr, fp),
-       struct _reent * ptr,
+__srefill_r (struct _reent * ptr,
        register FILE * fp)
 {
   /* make sure stdio is set up */
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index 810b282ac..a10582832 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -59,8 +59,7 @@ Supporting OS subroutine required: <<unlink>>.
 #include <stdio.h>
 
 int
-_DEFUN(_remove_r, (ptr, filename),
-       struct _reent *ptr,
+_remove_r (struct _reent *ptr,
        const char *filename)
 {
   if (_unlink_r (ptr, filename) == -1)
@@ -72,8 +71,7 @@ _DEFUN(_remove_r, (ptr, filename),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(remove, (filename),
-       const char *filename)
+remove (const char *filename)
 {
   return _remove_r (_REENT, filename);
 }
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index a32770846..b3c745a10 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -54,8 +54,7 @@ Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(rename, (old, new),
-       const char *old,
+rename (const char *old,
        const char *new)
 {
   return _rename_r (_REENT, old, new);
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index 745c93974..a65847d5e 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -52,8 +52,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <stdio.h>
 
 void
-_DEFUN(_rewind_r, (ptr, fp),
-       struct _reent * ptr,
+_rewind_r (struct _reent * ptr,
        register FILE * fp)
 {
   (void) _fseek_r (ptr, fp, 0L, SEEK_SET);
@@ -63,8 +62,7 @@ _DEFUN(_rewind_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 void
-_DEFUN(rewind, (fp),
-       register FILE * fp)
+rewind (register FILE * fp)
 {
   _rewind_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c
index d76f307d7..656e5661b 100644
--- a/newlib/libc/stdio/rget.c
+++ b/newlib/libc/stdio/rget.c
@@ -32,8 +32,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 int
-_DEFUN(__srget_r, (ptr, fp),
-       struct _reent *ptr,
+__srget_r (struct _reent *ptr,
        register FILE *fp)
 {
   /* Ensure that any fake std stream is resolved before
@@ -52,8 +51,7 @@ _DEFUN(__srget_r, (ptr, fp),
    required for backward compatibility with applications built against
    earlier dynamically built newlib libraries. */
 int
-_DEFUN(__srget, (fp),
-       register FILE *fp)
+__srget (register FILE *fp)
 {
   return __srget_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio/sccl.c b/newlib/libc/stdio/sccl.c
index d0bdfd936..c1bf2b189 100644
--- a/newlib/libc/stdio/sccl.c
+++ b/newlib/libc/stdio/sccl.c
@@ -31,8 +31,7 @@
  */
 
 u_char *
-_DEFUN(__sccl, (tab, fmt),
-       register char *tab,
+__sccl (register char *tab,
        register u_char *fmt)
 {
   register int c, n, v;
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index 1538762a1..f5471866d 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -65,8 +65,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 void
-_DEFUN(setbuf, (fp, buf),
-       FILE *__restrict fp,
+setbuf (FILE *__restrict fp,
        char *__restrict buf)
 {
   (void) setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index 2b93e7df3..35d17da3b 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -65,8 +65,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 void
-_DEFUN(setbuffer, (fp, buf, size),
-       FILE * fp,
+setbuffer (FILE * fp,
        char *buf,
        int size)
 {
diff --git a/newlib/libc/stdio/setlinebuf.c b/newlib/libc/stdio/setlinebuf.c
index d8cb013d9..d623b3014 100644
--- a/newlib/libc/stdio/setlinebuf.c
+++ b/newlib/libc/stdio/setlinebuf.c
@@ -56,8 +56,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 int
-_DEFUN(setlinebuf, (fp),
-       FILE * fp)
+setlinebuf (FILE * fp)
 {
   return (setvbuf (fp, (char *) NULL, _IOLBF, (size_t) 0));
 }
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index 6ce0ee1fe..63c9970e4 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -88,8 +88,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 int
-_DEFUN(setvbuf, (fp, buf, mode, size),
-       register FILE * fp,
+setvbuf (register FILE * fp,
        char *buf,
        register int mode,
        register size_t size)
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 2251e0912..6ec24777e 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -104,8 +104,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(_siprintf_r, (ptr, str, fmt),
-       struct _reent *ptr,
+_siprintf_r (struct _reent *ptr,
        char *str,
        const char *fmt, ...)
 #else
@@ -139,8 +138,7 @@ _siprintf_r(ptr, str, fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(siprintf, (str, fmt),
-       char *str,
+siprintf (char *str,
        const char *fmt, ...)
 #else
 siprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index bd1528b04..9b45ecdbb 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -87,8 +87,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 #ifdef _HAVE_STDC
 int 
-_DEFUN(siscanf, (str, fmt),
-       const char *str,
+siscanf (const char *str,
        const char *fmt, ...)
 #else
 int 
@@ -123,8 +122,7 @@ siscanf(str, fmt, va_alist)
 
 #ifdef _HAVE_STDC
 int 
-_DEFUN(_siscanf_r, (ptr, str, fmt), 
-       struct _reent *ptr,
+_siscanf_r (struct _reent *ptr,
        const char *str,
        const char *fmt, ...)
 #else
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index d7bb9a40e..d13278437 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -32,8 +32,7 @@
 
 int
 #ifdef _HAVE_STDC
-_DEFUN (_sniprintf_r, (ptr, str, size, fmt),
-	struct _reent *ptr,
+_sniprintf_r (struct _reent *ptr,
 	char *str,
 	size_t size,
 	const char *fmt, ...)
@@ -77,8 +76,7 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_DEFUN (sniprintf, (str, size, fmt),
-	char *str,
+sniprintf (char *str,
 	size_t size,
 	const char *fmt, ...)
 #else
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index ab33dfb47..d5ba7085c 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -31,8 +31,7 @@
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(_snprintf_r, (ptr, str, size, fmt),
-       struct _reent *ptr,
+_snprintf_r (struct _reent *ptr,
        char *__restrict str,
        size_t size,
        const char *__restrict fmt, ...)
@@ -82,8 +81,7 @@ _EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(snprintf, (str, size, fmt),
-       char *__restrict str,
+snprintf (char *__restrict str,
        size_t size,
        const char *__restrict fmt, ...)
 #else
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 35d39618f..bbb9753b9 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -580,8 +580,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(_sprintf_r, (ptr, str, fmt),
-       struct _reent *ptr,
+_sprintf_r (struct _reent *ptr,
        char *__restrict str,
        const char *__restrict fmt, ...)
 #else
@@ -621,8 +620,7 @@ _EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(sprintf, (str, fmt),
-       char *__restrict str,
+sprintf (char *__restrict str,
        const char *__restrict fmt, ...)
 #else
 sprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 92983b1ec..a04f9b65c 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -426,8 +426,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 #ifdef _HAVE_STDC
 int 
-_DEFUN(sscanf, (str, fmt),
-       const char *__restrict str,
+sscanf (const char *__restrict str,
        const char * fmt, ...)
 #else
 int 
@@ -468,8 +467,7 @@ _EXFUN(siscanf, (const char *, const char *, ...)
 
 #ifdef _HAVE_STDC
 int 
-_DEFUN(_sscanf_r, (ptr, str, fmt), 
-       struct _reent *ptr,
+_sscanf_r (struct _reent *ptr,
        const char *__restrict str,
        const char *__restrict fmt, ...)
 #else
diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index 0e8016b12..a72fb74d0 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -30,8 +30,7 @@
  */
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN(__sread, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+__sread (struct _reent *ptr,
        void *cookie,
        char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -63,8 +62,7 @@ _DEFUN(__sread, (ptr, cookie, buf, n),
 
 /* Dummy function used in sscanf/swscanf. */
 _READ_WRITE_RETURN_TYPE
-_DEFUN(__seofread, (ptr, cookie, buf, len),
-       struct _reent *_ptr,
+__seofread (struct _reent *_ptr,
        void *cookie,
        char *buf,
        _READ_WRITE_BUFSIZE_TYPE len)
@@ -73,8 +71,7 @@ _DEFUN(__seofread, (ptr, cookie, buf, len),
 }
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN(__swrite, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+__swrite (struct _reent *ptr,
        void *cookie,
        char const *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
@@ -105,8 +102,7 @@ _DEFUN(__swrite, (ptr, cookie, buf, n),
 }
 
 _fpos_t
-_DEFUN(__sseek, (ptr, cookie, offset, whence),
-       struct _reent *ptr,
+__sseek (struct _reent *ptr,
        void *cookie,
        _fpos_t offset,
        int whence)
@@ -126,8 +122,7 @@ _DEFUN(__sseek, (ptr, cookie, offset, whence),
 }
 
 int
-_DEFUN(__sclose, (ptr, cookie),
-       struct _reent *ptr,
+__sclose (struct _reent *ptr,
        void *cookie)
 {
   FILE *fp = (FILE *) cookie;
@@ -137,8 +132,7 @@ _DEFUN(__sclose, (ptr, cookie),
 
 #ifdef __SCLE
 int
-_DEFUN(__stextmode, (fd),
-       int fd)
+__stextmode (int fd)
 {
 #ifdef __CYGWIN__
   extern int _cygwin_istext_for_stdio (int);
diff --git a/newlib/libc/stdio/stdio_ext.c b/newlib/libc/stdio/stdio_ext.c
index 98f2ccaa9..857091fd7 100644
--- a/newlib/libc/stdio/stdio_ext.c
+++ b/newlib/libc/stdio/stdio_ext.c
@@ -62,50 +62,43 @@ No supporting OS subroutines are required.
 /* Subroutine versions of the inline or macro functions. */
 
 size_t
-_DEFUN(__fbufsize, (fp),
-       FILE * fp)
+__fbufsize (FILE * fp)
 {
   return (size_t) fp->_bf._size;
 }
 
 size_t
-_DEFUN(__fpending, (fp),
-       FILE * fp)
+__fpending (FILE * fp)
 {
   return fp->_p - fp->_bf._base;
 }
 
 int
-_DEFUN(__flbf, (fp),
-       FILE * fp)
+__flbf (FILE * fp)
 {
   return (fp->_flags & __SLBF) != 0;
 }
 
 int
-_DEFUN(__freadable, (fp),
-       FILE * fp)
+__freadable (FILE * fp)
 {
   return (fp->_flags & (__SRD | __SRW)) != 0;
 }
 
 int
-_DEFUN(__fwritable, (fp),
-       FILE * fp)
+__fwritable (FILE * fp)
 {
   return (fp->_flags & (__SWR | __SRW)) != 0;
 }
 
 int
-_DEFUN(__freading, (fp),
-       FILE * fp)
+__freading (FILE * fp)
 {
   return (fp->_flags & __SRD) != 0;
 }
 
 int
-_DEFUN(__fwriting, (fp),
-       FILE * fp)
+__fwriting (FILE * fp)
 {
   return (fp->_flags & __SWR) != 0;
 }
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index 427e03ed5..fa3b43e7a 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -553,8 +553,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  * a variable set to _REENT.  */
 
 int
-_DEFUN(_swprintf_r, (ptr, str, size, fmt),
-       struct _reent *ptr,
+_swprintf_r (struct _reent *ptr,
        wchar_t *str,
        size_t size,
        const wchar_t *fmt, ...)
@@ -594,8 +593,7 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(swprintf, (str, size, fmt),
-       wchar_t *__restrict str,
+swprintf (wchar_t *__restrict str,
        size_t size,
        const wchar_t *__restrict fmt, ...)
 {
diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c
index ee30523ab..f209a3edf 100644
--- a/newlib/libc/stdio/tmpfile.c
+++ b/newlib/libc/stdio/tmpfile.c
@@ -50,8 +50,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>,
 #endif
 
 FILE *
-_DEFUN(_tmpfile_r, (ptr),
-       struct _reent *ptr)
+_tmpfile_r (struct _reent *ptr)
 {
   FILE *fp;
   int e;
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index d794a988e..3bd5b6a58 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -86,8 +86,7 @@ The global pointer <<environ>> is also required.
    another one.  Return nonzero if successful, otherwise zero.  */
 
 static int
-_DEFUN(worker, (ptr, result, part1, part2, part3, part4),
-       struct _reent *ptr,
+worker (struct _reent *ptr,
        char *result,
        const char *part1,
        const char *part2,
@@ -118,8 +117,7 @@ _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
 }
 
 char *
-_DEFUN(_tmpnam_r, (p, s),
-       struct _reent *p,
+_tmpnam_r (struct _reent *p,
        char *s)
 {
   char *result;
@@ -147,8 +145,7 @@ _DEFUN(_tmpnam_r, (p, s),
 }
 
 char *
-_DEFUN(_tempnam_r, (p, dir, pfx),
-       struct _reent *p,
+_tempnam_r (struct _reent *p,
        const char *dir,
        const char *pfx)
 {
@@ -174,16 +171,14 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(tempnam, (dir, pfx),
-       const char *dir,
+tempnam (const char *dir,
        const char *pfx)
 {
   return _tempnam_r (_REENT, dir, pfx);
 }
 
 char *
-_DEFUN(tmpnam, (s),
-       char *s)
+tmpnam (char *s)
 {
   return _tmpnam_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index c673365b1..444577585 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -77,8 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 /*static*/
 int
-_DEFUN(__submore, (rptr, fp),
-       struct _reent *rptr,
+__submore (struct _reent *rptr,
        register FILE *fp)
 {
   register int i;
@@ -111,8 +110,7 @@ _DEFUN(__submore, (rptr, fp),
 }
 
 int
-_DEFUN(_ungetc_r, (rptr, c, fp),
-       struct _reent *rptr,
+_ungetc_r (struct _reent *rptr,
        int c,
        register FILE *fp)
 {
@@ -208,8 +206,7 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
 
 #ifndef _REENT_ONLY
 int
-_DEFUN(ungetc, (c, fp),
-       int c,
+ungetc (int c,
        register FILE *fp)
 {
   return _ungetc_r (_REENT, c, fp);
diff --git a/newlib/libc/stdio/ungetwc.c b/newlib/libc/stdio/ungetwc.c
index 60f3e5b49..16d37f2d1 100644
--- a/newlib/libc/stdio/ungetwc.c
+++ b/newlib/libc/stdio/ungetwc.c
@@ -74,8 +74,7 @@ C99
 #include "local.h"
 
 wint_t
-_DEFUN(_ungetwc_r, (ptr, wc, fp),
-	struct _reent *ptr,
+_ungetwc_r (struct _reent *ptr,
 	wint_t wc,
 	register FILE *fp)
 {
@@ -106,8 +105,7 @@ _DEFUN(_ungetwc_r, (ptr, wc, fp),
  * MT-safe version.
  */
 wint_t
-_DEFUN(ungetwc, (wint_t wc, FILE *fp),
-	wint_t wc,
+ungetwc (wint_t wc,
 	FILE *fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/vasiprintf.c b/newlib/libc/stdio/vasiprintf.c
index 259d44b0e..c7c5e35e4 100644
--- a/newlib/libc/stdio/vasiprintf.c
+++ b/newlib/libc/stdio/vasiprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vasiprintf, (strp, fmt, ap),
-       char **strp,
+vasiprintf (char **strp,
        const char *fmt,
        va_list ap)
 {
@@ -42,8 +41,7 @@ _DEFUN(vasiprintf, (strp, fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vasiprintf_r, (ptr, strp, fmt, ap),
-       struct _reent *ptr,
+_vasiprintf_r (struct _reent *ptr,
        char **strp,
        const char *fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vasniprintf.c b/newlib/libc/stdio/vasniprintf.c
index 9bbe30c59..edfbd2242 100644
--- a/newlib/libc/stdio/vasniprintf.c
+++ b/newlib/libc/stdio/vasniprintf.c
@@ -14,8 +14,7 @@
 #include "local.h"
 
 char *
-_DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
-       struct _reent *ptr,
+_vasniprintf_r (struct _reent *ptr,
        char *buf,
        size_t *lenp,
        const char *fmt,
@@ -59,8 +58,7 @@ _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(vasniprintf, (buf, lenp, fmt, ap),
-       char *buf,
+vasniprintf (char *buf,
        size_t *lenp,
        const char *fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 6edb47398..5bc0ec634 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -14,8 +14,7 @@
 #include "local.h"
 
 char *
-_DEFUN(_vasnprintf_r, (ptr, buf, lenp, fmt, ap),
-       struct _reent *ptr,
+_vasnprintf_r (struct _reent *ptr,
        char *buf,
        size_t *lenp,
        const char *fmt,
@@ -66,8 +65,7 @@ _EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(vasnprintf, (buf, lenp, fmt, ap),
-       char *buf,
+vasnprintf (char *buf,
        size_t *lenp,
        const char *fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index c0961de01..4acbc0479 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vasprintf, (strp, fmt, ap),
-       char **strp,
+vasprintf (char **strp,
        const char *fmt,
        va_list ap)
 {
@@ -48,8 +47,7 @@ _EXFUN(vasiprintf, (char **, const char *, __VALIST)
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vasprintf_r, (ptr, strp, fmt, ap),
-       struct _reent *ptr,
+_vasprintf_r (struct _reent *ptr,
        char **strp,
        const char *fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vdiprintf.c b/newlib/libc/stdio/vdiprintf.c
index 73a3b19d1..22a71b326 100644
--- a/newlib/libc/stdio/vdiprintf.c
+++ b/newlib/libc/stdio/vdiprintf.c
@@ -13,8 +13,7 @@
 #include "local.h"
 
 int
-_DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
-       struct _reent *ptr,
+_vdiprintf_r (struct _reent *ptr,
        int fd,
        const char *format,
        va_list ap)
@@ -36,8 +35,7 @@ _DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vdiprintf, (fd, format, ap),
-       int fd,
+vdiprintf (int fd,
        const char *format,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index 1b50e8833..6261f6217 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -13,8 +13,7 @@
 #include "local.h"
 
 int
-_DEFUN(_vdprintf_r, (ptr, fd, format, ap),
-       struct _reent *ptr,
+_vdprintf_r (struct _reent *ptr,
        int fd,
        const char *__restrict format,
        va_list ap)
@@ -42,8 +41,7 @@ _EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vdprintf, (fd, format, ap),
-       int fd,
+vdprintf (int fd,
        const char *__restrict format,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index f2d052b13..c2e59fc4a 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -198,8 +198,7 @@ static char *rcsid = "$Id$";
 #ifdef INTEGER_ONLY
 #ifndef _FVWRITE_IN_STREAMIO
 int
-_DEFUN(__ssputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr,
+__ssputs_r (struct _reent *ptr,
        FILE *fp,
        const char *buf,
        size_t len)
@@ -267,8 +266,7 @@ err:
 #endif
 
 int
-_DEFUN(__ssprint_r, (ptr, fp, uio),
-       struct _reent *ptr,
+__ssprint_r (struct _reent *ptr,
        FILE *fp,
        register struct __suio *uio)
 {
@@ -369,8 +367,7 @@ int __ssprint_r (struct _reent *, FILE *, register struct __suio *);
 
 #ifndef _FVWRITE_IN_STREAMIO
 int
-_DEFUN(__sfputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr,
+__sfputs_r (struct _reent *ptr,
        FILE *fp,
        const char *buf,
        size_t len)
@@ -403,8 +400,7 @@ _DEFUN(__sfputs_r, (ptr, fp, buf, len),
  * then reset it so that it can be reused.
  */
 int
-_DEFUN(__sprint_r, (ptr, fp, uio),
-       struct _reent *ptr,
+__sprint_r (struct _reent *ptr,
        FILE *fp,
        register struct __suio *uio)
 {
@@ -456,8 +452,7 @@ int __sprint_r (struct _reent *, FILE *, register struct __suio *);
  * Make sure to avoid inlining.
  */
 _NOINLINE_STATIC int
-_DEFUN(__sbprintf, (rptr, fp, fmt, ap),
-       struct _reent *rptr,
+__sbprintf (struct _reent *rptr,
        register FILE *fp,
        const char *fmt,
        va_list ap)
@@ -648,8 +643,7 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
 
 #ifndef STRING_ONLY
 int
-_DEFUN(VFPRINTF, (fp, fmt0, ap),
-       FILE * fp,
+VFPRINTF (FILE * fp,
        const char *fmt0,
        va_list ap)
 {
@@ -660,8 +654,7 @@ _DEFUN(VFPRINTF, (fp, fmt0, ap),
 #endif /* STRING_ONLY */
 
 int
-_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data,
+_VFPRINTF_R (struct _reent *data,
        FILE * fp,
        const char *fmt0,
        va_list ap)
@@ -2043,8 +2036,7 @@ const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
 
 /* function to get positional parameter N where n = N - 1 */
 static union arg_val *
-_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
-       struct _reent *data,
+get_arg (struct _reent *data,
        int n,
        char *fmt,
        va_list *ap,
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index d76d94b8c..097fd801c 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -224,8 +224,7 @@ typedef unsigned long long u_long_long;
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(VFSCANF, (fp, fmt, ap),
-       register FILE *fp,
+VFSCANF (register FILE *fp,
        const char *fmt,
        va_list ap)
 {
@@ -236,8 +235,7 @@ _DEFUN(VFSCANF, (fp, fmt, ap),
 }
 
 int
-_DEFUN(__SVFSCANF, (fp, fmt0, ap),
-       register FILE *fp,
+__SVFSCANF (register FILE *fp,
        char const *fmt0,
        va_list ap)
 {
@@ -247,8 +245,7 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data,
+_VFSCANF_R (struct _reent *data,
        register FILE *fp,
        const char *fmt,
        va_list ap)
@@ -263,8 +260,7 @@ _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
  * regular ungetc which will drag in file I/O items we don't need.
  * So, we create our own trimmed-down version.  */
 int
-_DEFUN(_sungetc_r, (data, fp, ch),
-	struct _reent *data,
+_sungetc_r (struct _reent *data,
 	int c,
 	register FILE *fp)
 {
@@ -321,8 +317,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
 
 /* String only version of __srefill_r for sscanf family.  */
 int
-_DEFUN(__ssrefill_r, (ptr, fp),
-       struct _reent * ptr,
+__ssrefill_r (struct _reent * ptr,
        register FILE * fp)
 {
   /*
@@ -347,8 +342,7 @@ _DEFUN(__ssrefill_r, (ptr, fp),
 }
 
 size_t
-_DEFUN(_sfread_r, (ptr, buf, size, count, fp),
-       struct _reent * ptr,
+_sfread_r (struct _reent * ptr,
        void *buf,
        size_t size,
        size_t count,
@@ -402,8 +396,7 @@ __wctob (struct _reent *rptr, wint_t wc)
 }
 
 int
-_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr,
+__SVFSCANF_R (struct _reent *rptr,
        register FILE *fp,
        char const *fmt0,
        va_list ap)
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 449b628db..dd78eb015 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -174,8 +174,7 @@ int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
  * worries about ungetc buffers and so forth.
  */
 static int
-_DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
-       struct _reent *rptr,
+__sbwprintf (struct _reent *rptr,
        register FILE *fp,
        const wchar_t *fmt,
        va_list ap)
@@ -366,8 +365,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
 
 #ifndef STRING_ONLY
 int
-_DEFUN(VFWPRINTF, (fp, fmt0, ap),
-       FILE *__restrict fp,
+VFWPRINTF (FILE *__restrict fp,
        const wchar_t *__restrict fmt0,
        va_list ap)
 {
@@ -378,8 +376,7 @@ _DEFUN(VFWPRINTF, (fp, fmt0, ap),
 #endif /* STRING_ONLY */
 
 int
-_DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data,
+_VFWPRINTF_R (struct _reent *data,
        FILE * fp,
        const wchar_t *fmt0,
        va_list ap)
@@ -1734,8 +1731,7 @@ wexponent(wchar_t *p0, int exp, int fmtch)
 
 /* function to get positional parameter N where n = N - 1 */
 static union arg_val *
-_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
-       struct _reent *data,
+get_arg (struct _reent *data,
        int n,
        wchar_t *fmt,
        va_list *ap,
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 3ac6ecc07..c3470a15c 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -226,8 +226,7 @@ static void * get_arg (int, va_list *, int *, void **);
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(VFWSCANF, (fp, fmt, ap),
-       register FILE *__restrict fp,
+VFWSCANF (register FILE *__restrict fp,
        const wchar_t *__restrict fmt,
        va_list ap)
 {
@@ -238,8 +237,7 @@ _DEFUN(VFWSCANF, (fp, fmt, ap),
 }
 
 int
-_DEFUN(__SVFWSCANF, (fp, fmt0, ap),
-       register FILE *fp,
+__SVFWSCANF (register FILE *fp,
        wchar_t const *fmt0,
        va_list ap)
 {
@@ -249,8 +247,7 @@ _DEFUN(__SVFWSCANF, (fp, fmt0, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data,
+_VFWSCANF_R (struct _reent *data,
        register FILE *fp,
        const wchar_t *fmt,
        va_list ap)
@@ -265,8 +262,7 @@ _DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
  * regular ungetwc which will drag in file I/O items we don't need.
  * So, we create our own trimmed-down version.  */
 static wint_t
-_DEFUN(_sungetwc_r, (data, fp, ch),
-	struct _reent *data,
+_sungetwc_r (struct _reent *data,
 	wint_t wc,
 	register FILE *fp)
 {
@@ -325,8 +321,7 @@ _DEFUN(_sungetwc_r, (data, fp, ch),
 extern int __ssrefill_r (struct _reent *ptr, register FILE * fp);
 
 static size_t
-_DEFUN(_sfgetwc_r, (ptr, fp),
-       struct _reent * ptr,
+_sfgetwc_r (struct _reent * ptr,
        FILE * fp)
 {
   wchar_t wc;
@@ -341,8 +336,7 @@ _DEFUN(_sfgetwc_r, (ptr, fp),
 #endif /* STRING_ONLY */
 
 int
-_DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr,
+__SVFWSCANF_R (struct _reent *rptr,
        register FILE *fp,
        wchar_t const *fmt0,
        va_list ap)
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index 950009d4a..9678815f1 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -105,8 +105,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(viprintf, (fmt, ap),
-       const char *fmt,
+viprintf (const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -118,8 +117,7 @@ _DEFUN(viprintf, (fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_viprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr,
+_viprintf_r (struct _reent *ptr,
        const char *fmt,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 0c9b13f58..e5ad1dbbd 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -89,8 +89,7 @@ Supporting OS subroutines required:
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(viscanf, (fmt, ap), 
-       const char *fmt,
+viscanf (const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -102,8 +101,7 @@ _DEFUN(viscanf, (fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_viscanf_r, (ptr, fmt, ap),
-       struct _reent *ptr,
+_viscanf_r (struct _reent *ptr,
        const char *fmt,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 289c46cd0..79c324d55 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -29,8 +29,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vprintf, (fmt, ap),
-       const char *fmt,
+vprintf (const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -47,8 +46,7 @@ _EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr,
+_vprintf_r (struct _reent *ptr,
        const char *__restrict fmt,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index 260359a3e..be329ded4 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -30,8 +30,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vscanf, (fmt, ap), 
-       const char *fmt,
+vscanf (const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -48,8 +47,7 @@ _EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vscanf_r, (ptr, fmt, ap),
-       struct _reent *ptr,
+_vscanf_r (struct _reent *ptr,
        const char *__restrict fmt,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/vsiprintf.c b/newlib/libc/stdio/vsiprintf.c
index ff83b7856..74eae0253 100644
--- a/newlib/libc/stdio/vsiprintf.c
+++ b/newlib/libc/stdio/vsiprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsiprintf, (str, fmt, ap),
-       char *str,
+vsiprintf (char *str,
        const char *fmt,
        va_list ap)
 {
@@ -42,8 +41,7 @@ _DEFUN(vsiprintf, (str, fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsiprintf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr,
+_vsiprintf_r (struct _reent *ptr,
        char *str,
        const char *fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index 6ad0f4a8d..5679df056 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -35,8 +35,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsiscanf, (str, fmt, ap), 
-       const char *str,
+vsiscanf (const char *str,
        const char *fmt,
        va_list ap)
 {
@@ -46,8 +45,7 @@ _DEFUN(vsiscanf, (str, fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr,
+_vsiscanf_r (struct _reent *ptr,
        const char *str,
        const char *fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vsniprintf.c b/newlib/libc/stdio/vsniprintf.c
index e60f779ca..6036c8cb8 100644
--- a/newlib/libc/stdio/vsniprintf.c
+++ b/newlib/libc/stdio/vsniprintf.c
@@ -32,8 +32,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsniprintf, (str, size, fmt, ap),
-       char *str,
+vsniprintf (char *str,
        size_t size,
        const char *fmt,
        va_list ap)
@@ -44,8 +43,7 @@ _DEFUN(vsniprintf, (str, size, fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsniprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr,
+_vsniprintf_r (struct _reent *ptr,
        char *str,
        size_t size,
        const char *fmt,
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index dda45256a..02b5443bf 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -32,8 +32,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsnprintf, (str, size, fmt, ap),
-       char *__restrict str,
+vsnprintf (char *__restrict str,
        size_t size,
        const char *__restrict fmt,
        va_list ap)
@@ -50,8 +49,7 @@ _EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr,
+_vsnprintf_r (struct _reent *ptr,
        char *__restrict str,
        size_t size,
        const char *__restrict fmt,
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 4940b974e..7344a3854 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsprintf, (str, fmt, ap),
-       char *__restrict str,
+vsprintf (char *__restrict str,
        const char *__restrict fmt,
        va_list ap)
 {
@@ -48,8 +47,7 @@ _EXFUN(vsiprintf, (char *, const char *, __VALIST)
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsprintf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr,
+_vsprintf_r (struct _reent *ptr,
        char *__restrict str,
        const char *__restrict fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 87d4cd161..61c65cd5e 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -35,8 +35,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsscanf, (str, fmt, ap), 
-       const char *__restrict str,
+vsscanf (const char *__restrict str,
        const char *__restrict fmt,
        va_list ap)
 {
@@ -52,8 +51,7 @@ _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr,
+_vsscanf_r (struct _reent *ptr,
        const char *__restrict str,
        const char *__restrict fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vswprintf.c b/newlib/libc/stdio/vswprintf.c
index 9c9127cd6..5297a27cf 100644
--- a/newlib/libc/stdio/vswprintf.c
+++ b/newlib/libc/stdio/vswprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include "local.h"
 
 int
-_DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr,
+_vswprintf_r (struct _reent *ptr,
        wchar_t *str,
        size_t size,
        const wchar_t *fmt,
@@ -70,8 +69,7 @@ _DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vswprintf, (str, size, fmt, ap),
-       wchar_t *__restrict str,
+vswprintf (wchar_t *__restrict str,
        size_t size,
        const wchar_t *__restrict fmt,
        va_list ap)
diff --git a/newlib/libc/stdio/vwprintf.c b/newlib/libc/stdio/vwprintf.c
index 28381363e..d1b7d4cd0 100644
--- a/newlib/libc/stdio/vwprintf.c
+++ b/newlib/libc/stdio/vwprintf.c
@@ -26,8 +26,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vwprintf, (fmt, ap),
-       const wchar_t *__restrict fmt,
+vwprintf (const wchar_t *__restrict fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -39,8 +38,7 @@ _DEFUN(vwprintf, (fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vwprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr,
+_vwprintf_r (struct _reent *ptr,
        const wchar_t *fmt,
        va_list ap)
 {
diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c
index 13578ea33..034d8ebcc 100644
--- a/newlib/libc/stdio/wbuf.c
+++ b/newlib/libc/stdio/wbuf.c
@@ -33,8 +33,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 int
-_DEFUN(__swbuf_r, (ptr, c, fp),
-       struct _reent *ptr,
+__swbuf_r (struct _reent *ptr,
        register int c,
        register FILE *fp)
 {
@@ -88,8 +87,7 @@ _DEFUN(__swbuf_r, (ptr, c, fp),
    required for backward compatibility with applications built against
    earlier dynamically built newlib libraries. */
 int
-_DEFUN(__swbuf, (c, fp),
-       register int c,
+__swbuf (register int c,
        register FILE *fp)
 {
   return __swbuf_r (_REENT, c, fp);
diff --git a/newlib/libc/stdio/wprintf.c b/newlib/libc/stdio/wprintf.c
index ef212d851..176b16a20 100644
--- a/newlib/libc/stdio/wprintf.c
+++ b/newlib/libc/stdio/wprintf.c
@@ -24,8 +24,7 @@
 #include "local.h"
 
 int
-_DEFUN(_wprintf_r, (ptr, fmt),
-       struct _reent *ptr,
+_wprintf_r (struct _reent *ptr,
        const wchar_t *fmt, ...)
 {
   int ret;
@@ -41,8 +40,7 @@ _DEFUN(_wprintf_r, (ptr, fmt),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(wprintf, (fmt),
-       const wchar_t *__restrict fmt, ...)
+wprintf (const wchar_t *__restrict fmt, ...)
 {
   int ret;
   va_list ap;
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c
index 72280d2df..5a4fc0ace 100644
--- a/newlib/libc/stdio/wsetup.c
+++ b/newlib/libc/stdio/wsetup.c
@@ -30,8 +30,7 @@
  */
 
 int
-_DEFUN(__swsetup_r, (ptr, fp),
-       struct _reent *ptr,
+__swsetup_r (struct _reent *ptr,
        register FILE * fp)
 {
   /* Make sure stdio is set up.  */
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index 3c8d4fa05..9d9645b36 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -35,8 +35,7 @@ File pointer or <<NULL>>, as for <<fopen>>.
 extern int __sflags ();
 
 FILE *
-_DEFUN (_fdopen64_r, (ptr, fd, mode),
-	struct _reent *ptr,
+_fdopen64_r (struct _reent *ptr,
 	int fd,
 	const char *mode)
 {
@@ -108,8 +107,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN (fdopen64, (fd, mode),
-	int fd,
+fdopen64 (int fd,
 	const char *mode)
 {
   return _fdopen64_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio64/fgetpos64.c b/newlib/libc/stdio64/fgetpos64.c
index e2dd28914..52ead9d0d 100644
--- a/newlib/libc/stdio64/fgetpos64.c
+++ b/newlib/libc/stdio64/fgetpos64.c
@@ -45,8 +45,7 @@ No supporting OS subroutines are required.
 #ifdef __LARGE64_FILES
 
 int
-_DEFUN (_fgetpos64_r, (ptr, fp, pos),
-	struct _reent * ptr,
+_fgetpos64_r (struct _reent * ptr,
 	FILE * fp,
 	_fpos64_t * pos)
 {
@@ -62,8 +61,7 @@ _DEFUN (_fgetpos64_r, (ptr, fp, pos),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fgetpos64, (fp, pos),
-	FILE * fp,
+fgetpos64 (FILE * fp,
 	_fpos64_t * pos)
 {
   return _fgetpos64_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 406afa190..8c8df9141 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -64,8 +64,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifdef __LARGE64_FILES
 
 FILE *
-_DEFUN (_fopen64_r, (ptr, file, mode),
-	struct _reent *ptr,
+_fopen64_r (struct _reent *ptr,
 	const char *file,
 	const char *mode)
 {
@@ -117,8 +116,7 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN (fopen64, (file, mode),
-	const char *file,
+fopen64 (const char *file,
 	const char *mode)
 {
   return _fopen64_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index d267899c6..17942b74a 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -75,8 +75,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef __LARGE64_FILES
 
 FILE *
-_DEFUN (_freopen64_r, (ptr, file, mode, fp),
-	struct _reent *ptr,
+_freopen64_r (struct _reent *ptr,
 	const char *file,
 	const char *mode,
 	register FILE *fp)
@@ -247,8 +246,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN (freopen64, (file, mode, fp),
-	const char *file,
+freopen64 (const char *file,
 	const char *mode,
 	register FILE *fp)
 {
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 8cd11fa67..085855d4b 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -85,8 +85,7 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
  */
 
 _off64_t
-_DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
-     struct _reent *ptr,
+_fseeko64_r (struct _reent *ptr,
      register FILE *fp,
      _off64_t offset,
      int whence)
@@ -342,8 +341,7 @@ dumb:
 #ifndef _REENT_ONLY
 
 _off64_t
-_DEFUN (fseeko64, (fp, offset, whence),
-     register FILE *fp,
+fseeko64 (register FILE *fp,
      _off64_t offset,
      int whence)
 {
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index f5f6bdacf..254eb53d7 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -41,8 +41,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef __LARGE64_FILES
 
 int
-_DEFUN (_fsetpos64_r, (ptr, iop, pos),
-	struct _reent *ptr,
+_fsetpos64_r (struct _reent *ptr,
 	FILE * iop,
 	const _fpos64_t * pos)
 {
@@ -56,8 +55,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fsetpos64, (iop, pos),
-	FILE * iop,
+fsetpos64 (FILE * iop,
 	const _fpos64_t * pos)
 {
   return _fsetpos64_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index 3c4663ba4..c1179348a 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -76,8 +76,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #ifdef __LARGE64_FILES
 
 _off64_t
-_DEFUN (_ftello64_r, (ptr, fp),
-	struct _reent *ptr,
+_ftello64_r (struct _reent *ptr,
 	register FILE * fp)
 {
   _fpos64_t pos;
@@ -144,8 +143,7 @@ _DEFUN (_ftello64_r, (ptr, fp),
 #ifndef _REENT_ONLY
 
 _off64_t
-_DEFUN (ftello64, (fp),
-	register FILE * fp)
+ftello64 (register FILE * fp)
 {
   return _ftello64_r (_REENT, fp);
 }
diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
index 813b919bf..8e5efc8b0 100644
--- a/newlib/libc/stdio64/stdio64.c
+++ b/newlib/libc/stdio64/stdio64.c
@@ -26,8 +26,7 @@
 
 #ifdef __LARGE64_FILES
 _fpos64_t
-_DEFUN(__sseek64, (ptr, cookie, offset, whence),
-       struct _reent *ptr,
+__sseek64 (struct _reent *ptr,
        void *cookie,
        _fpos64_t offset,
        int whence)
@@ -47,8 +46,7 @@ _DEFUN(__sseek64, (ptr, cookie, offset, whence),
 }
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN(__swrite64, (ptr, cookie, buf, n),
-       struct _reent *ptr,
+__swrite64 (struct _reent *ptr,
        void *cookie,
        char const *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c
index 2012417fb..18a38d65c 100644
--- a/newlib/libc/stdio64/tmpfile64.c
+++ b/newlib/libc/stdio64/tmpfile64.c
@@ -53,8 +53,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>,
 #ifdef __LARGE64_FILES
 
 FILE *
-_DEFUN (_tmpfile64_r, (ptr),
-	struct _reent *ptr)
+_tmpfile64_r (struct _reent *ptr)
 {
   FILE *fp;
   int e;
diff --git a/newlib/libc/stdlib/_Exit.c b/newlib/libc/stdlib/_Exit.c
index b07559acb..8e205a0c3 100644
--- a/newlib/libc/stdlib/_Exit.c
+++ b/newlib/libc/stdlib/_Exit.c
@@ -34,8 +34,7 @@ Supporting OS subroutines required: <<_exit>>.
 #include <reent.h>
 
 void 
-_DEFUN (_Exit, (code),
-	int code)
+_Exit (int code)
 {
   _exit (code);
 }
diff --git a/newlib/libc/stdlib/__adjust.c b/newlib/libc/stdlib/__adjust.c
index 7627cc7ac..4c478f30b 100644
--- a/newlib/libc/stdlib/__adjust.c
+++ b/newlib/libc/stdlib/__adjust.c
@@ -9,8 +9,7 @@
 #define abs(x) (((x) < 0) ? -(x) : (x))
 
 double
-_DEFUN (__adjust, (ptr, acc, dexp, sign),
-	struct _reent *ptr,
+__adjust (struct _reent *ptr,
 	double *acc,
 	int dexp,
 	int sign)
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c
index cb4a2682e..18e47dc95 100644
--- a/newlib/libc/stdlib/__atexit.c
+++ b/newlib/libc/stdlib/__atexit.c
@@ -63,9 +63,7 @@ static struct _atexit _global_atexit0 = _ATEXIT_INIT;
  */
 
 int
-_DEFUN (__register_exitproc,
-	(type, fn, arg, d),
-	int type,
+__register_exitproc (int type,
 	void (*fn) (void),
 	void *arg,
 	void *d)
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
index ad70fcd33..d8e72993e 100644
--- a/newlib/libc/stdlib/__call_atexit.c
+++ b/newlib/libc/stdlib/__call_atexit.c
@@ -65,8 +65,7 @@ register_fini(void)
  */
 
 void 
-_DEFUN (__call_exitprocs, (code, d),
-	int code, void *d)
+__call_exitprocs (int code, void *d)
 {
   register struct _atexit *p;
   struct _atexit **lastp;
diff --git a/newlib/libc/stdlib/__exp10.c b/newlib/libc/stdlib/__exp10.c
index 1ff81a680..cf223742b 100644
--- a/newlib/libc/stdlib/__exp10.c
+++ b/newlib/libc/stdlib/__exp10.c
@@ -6,8 +6,7 @@
 #include "std.h"
 
 double
-_DEFUN (__exp10, (x),
-	unsigned x)
+__exp10 (unsigned x)
 {
   static const double powtab[] =
   {1.0,
diff --git a/newlib/libc/stdlib/__ten_mu.c b/newlib/libc/stdlib/__ten_mu.c
index a7fe70caf..25af8d0c7 100644
--- a/newlib/libc/stdlib/__ten_mu.c
+++ b/newlib/libc/stdlib/__ten_mu.c
@@ -9,8 +9,7 @@
 #include "std.h"
 
 int
-_DEFUN (__ten_mul, (acc, digit),
-	double *acc,
+__ten_mul (double *acc,
 	int digit)
 {
   /*
diff --git a/newlib/libc/stdlib/a64l.c b/newlib/libc/stdlib/a64l.c
index 8d68ed0e9..dcac2e050 100644
--- a/newlib/libc/stdlib/a64l.c
+++ b/newlib/libc/stdlib/a64l.c
@@ -56,8 +56,7 @@ Supporting OS subroutines required: None.
 #include <limits.h>
 
 long
-_DEFUN (a64l, (input),
-	const char *input)
+a64l (const char *input)
 {
   const char *ptr;
   char ch;
diff --git a/newlib/libc/stdlib/abs.c b/newlib/libc/stdlib/abs.c
index d347265fa..85a3fecd8 100644
--- a/newlib/libc/stdlib/abs.c
+++ b/newlib/libc/stdlib/abs.c
@@ -32,7 +32,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 
 int
-_DEFUN (abs, (i), int i)
+abs (int i)
 {
   return (i < 0) ? -i : i;
 }
diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index ba5b46197..46ac92b8c 100644
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -50,8 +50,7 @@ Supporting OS subroutines required (only if enabled): <<close>>, <<fstat>>,
 #ifndef HAVE_ASSERT_FUNC
 /* func can be NULL, in which case no function information is given.  */
 void
-_DEFUN (__assert_func, (file, line, func, failedexpr),
-	const char *file,
+__assert_func (const char *file,
 	int line,
 	const char *func,
 	const char *failedexpr)
@@ -66,8 +65,7 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
 #endif /* HAVE_ASSERT_FUNC */
 
 void
-_DEFUN (__assert, (file, line, failedexpr),
-	const char *file,
+__assert (const char *file,
 	int line,
 	const char *failedexpr)
 {
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index 1710aff14..1d300bd0f 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -53,9 +53,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 int
-_DEFUN (atexit,
-	(fn),
-	void _EXFNPTR(fn, (void)))
+atexit (void _EXFNPTR(fn, (void)))
 {
   return __register_exitproc (__et_atexit, fn, NULL, NULL);
 }
diff --git a/newlib/libc/stdlib/atof.c b/newlib/libc/stdlib/atof.c
index 7dfbd9c55..17ba0fa52 100644
--- a/newlib/libc/stdlib/atof.c
+++ b/newlib/libc/stdlib/atof.c
@@ -57,8 +57,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <_ansi.h>
 
 double
-_DEFUN (atof, (s),
-	const char *s)
+atof (const char *s)
 {
   return strtod (s, NULL);
 }
diff --git a/newlib/libc/stdlib/atoff.c b/newlib/libc/stdlib/atoff.c
index 2966254be..e25ff2917 100644
--- a/newlib/libc/stdlib/atoff.c
+++ b/newlib/libc/stdlib/atoff.c
@@ -2,8 +2,7 @@
 #include <_ansi.h>
 
 float
-_DEFUN (atoff, (s),
-	const char *s)
+atoff (const char *s)
 {
   return strtof (s, NULL);
 }
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index 83ad24177..4da53e80a 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -47,16 +47,14 @@ No supporting OS subroutines are required.
 
 #ifndef _REENT_ONLY
 int
-_DEFUN (atoi, (s),
-	const char *s)
+atoi (const char *s)
 {
   return (int) strtol (s, NULL, 10);
 }
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN (_atoi_r, (s),
-	struct _reent *ptr,
+_atoi_r (struct _reent *ptr,
 	const char *s)
 {
   return (int) _strtol_r (ptr, s, NULL, 10);
diff --git a/newlib/libc/stdlib/atol.c b/newlib/libc/stdlib/atol.c
index cad512fbc..a5c8ee9f4 100644
--- a/newlib/libc/stdlib/atol.c
+++ b/newlib/libc/stdlib/atol.c
@@ -7,14 +7,14 @@
 
 #ifndef _REENT_ONLY
 long
-_DEFUN (atol, (s), const char *s)
+atol (const char *s)
 {
   return strtol (s, NULL, 10);
 }
 #endif /* !_REENT_ONLY */
 
 long
-_DEFUN (_atol_r, (ptr, s), struct _reent *ptr, const char *s)
+_atol_r (struct _reent *ptr, const char *s)
 {
   return _strtol_r (ptr, s, NULL, 10);
 }
diff --git a/newlib/libc/stdlib/atoll.c b/newlib/libc/stdlib/atoll.c
index e853f25eb..a8c56fe16 100644
--- a/newlib/libc/stdlib/atoll.c
+++ b/newlib/libc/stdlib/atoll.c
@@ -69,16 +69,14 @@ No supporting OS subroutines are required.
 
 #ifndef _REENT_ONLY
 long long
-_DEFUN(atoll, (str),
-       const char *str)
+atoll (const char *str)
 {
 	return strtoll(str, (char **)NULL, 10);
 }
 #endif /* !_REENT_ONLY */
 
 long long
-_DEFUN(_atoll_r, (ptr, str),
-       struct _reent *ptr,
+_atoll_r (struct _reent *ptr,
        const char *str)
 {
 	return _strtoll_r(ptr, str, (char **)NULL, 10);
diff --git a/newlib/libc/stdlib/calloc.c b/newlib/libc/stdlib/calloc.c
index f853f4f3c..208e27eb1 100644
--- a/newlib/libc/stdlib/calloc.c
+++ b/newlib/libc/stdlib/calloc.c
@@ -46,8 +46,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (calloc, (n, size),
-	size_t n,
+calloc (size_t n,
 	size_t size)
 {
   return _calloc_r (_REENT, n, size);
diff --git a/newlib/libc/stdlib/cxa_atexit.c b/newlib/libc/stdlib/cxa_atexit.c
index 096add4fa..ae2d21a60 100644
--- a/newlib/libc/stdlib/cxa_atexit.c
+++ b/newlib/libc/stdlib/cxa_atexit.c
@@ -22,9 +22,7 @@ const void * const __cxa_atexit_dummy = &__on_exit_args;
  */
 
 int
-_DEFUN (__cxa_atexit,
-	(fn, arg, d),
-	void (*fn) (void *),
+__cxa_atexit (void (*fn) (void *),
 	void *arg,
 	void *d)
 {
diff --git a/newlib/libc/stdlib/cxa_finalize.c b/newlib/libc/stdlib/cxa_finalize.c
index 17d0526a7..467532881 100644
--- a/newlib/libc/stdlib/cxa_finalize.c
+++ b/newlib/libc/stdlib/cxa_finalize.c
@@ -13,8 +13,7 @@
  */
 
 void 
-_DEFUN (__cxa_finalize, (d),
-	void * d)
+__cxa_finalize (void * d)
 {
   __call_exitprocs (0, d);
 }
diff --git a/newlib/libc/stdlib/div.c b/newlib/libc/stdlib/div.c
index 4d2ffee48..20ad7b865 100644
--- a/newlib/libc/stdlib/div.c
+++ b/newlib/libc/stdlib/div.c
@@ -81,8 +81,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>		/* div_t */
 
 div_t
-_DEFUN (div, (num, denom),
-	int num,
+div (int num,
 	int denom)
 {
 	div_t r;
diff --git a/newlib/libc/stdlib/drand48.c b/newlib/libc/stdlib/drand48.c
index 6c4dca1ed..061689448 100644
--- a/newlib/libc/stdlib/drand48.c
+++ b/newlib/libc/stdlib/drand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 double
-_DEFUN (_drand48_r, (r),
-       struct _reent *r)
+_drand48_r (struct _reent *r)
 {
   _REENT_CHECK_RAND48(r);
   return _erand48_r(r, __rand48_seed);
diff --git a/newlib/libc/stdlib/dtoa.c b/newlib/libc/stdlib/dtoa.c
index 3b8976435..c38f37afd 100644
--- a/newlib/libc/stdlib/dtoa.c
+++ b/newlib/libc/stdlib/dtoa.c
@@ -33,9 +33,7 @@
 #include "mprec.h"
 
 static int
-_DEFUN (quorem,
-	(b, S),
-	_Bigint * b, _Bigint * S)
+quorem (_Bigint * b, _Bigint * S)
 {
   int n;
   __Long borrow, y;
@@ -177,9 +175,7 @@ _DEFUN (quorem,
 
 
 char *
-_DEFUN (_dtoa_r,
-	(ptr, _d, mode, ndigits, decpt, sign, rve),
-	struct _reent *ptr,
+_dtoa_r (struct _reent *ptr,
 	double _d,
 	int mode,
 	int ndigits,
diff --git a/newlib/libc/stdlib/dtoastub.c b/newlib/libc/stdlib/dtoastub.c
index a857c2452..d1c8a6756 100644
--- a/newlib/libc/stdlib/dtoastub.c
+++ b/newlib/libc/stdlib/dtoastub.c
@@ -8,9 +8,7 @@
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN (__dtoa,
-	(d, mode, ndigits, decpt, sign, rve),
-	double d,
+__dtoa (double d,
 	int mode,
 	int ndigits,
 	int *decpt,
diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c
index 2326f55ca..e3d7b55d8 100644
--- a/newlib/libc/stdlib/ecvtbuf.c
+++ b/newlib/libc/stdlib/ecvtbuf.c
@@ -58,8 +58,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 static void
-_DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode),
-	struct _reent *ptr,
+print_f (struct _reent *ptr,
 	char *buf,
 	double invalue,
 	int ndigit,
@@ -126,8 +125,7 @@ _DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode),
    WIDTH is the number of digits of precision after the decimal point.  */
 
 static void
-_DEFUN (print_e, (ptr, buf, invalue, width, type, dot),
-	struct _reent *ptr,
+print_e (struct _reent *ptr,
 	char *buf,
 	double invalue,
 	int width,
@@ -209,8 +207,7 @@ _DEFUN (print_e, (ptr, buf, invalue, width, type, dot),
    support ecvt and fcvt, which aren't ANSI anyway.  */
 
 char *
-_DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
-	double invalue,
+fcvtbuf (double invalue,
 	int ndigit,
 	int *decpt,
 	int *sign,
@@ -266,8 +263,7 @@ _DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
 }
 
 char *
-_DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
-	double invalue,
+ecvtbuf (double invalue,
 	int ndigit,
 	int *decpt,
 	int *sign,
@@ -317,8 +313,7 @@ _DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
 #endif
 
 char *
-_DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot),
-	struct _reent *ptr,
+_gcvt (struct _reent *ptr,
 	double invalue,
 	int ndigit,
 	char *buf,
@@ -425,8 +420,7 @@ _DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot),
 }
 
 char *
-_DEFUN (_dcvt, (ptr, buffer, invalue, precision, width, type, dot),
-	struct _reent *ptr,
+_dcvt (struct _reent *ptr,
 	char *buffer,
 	double invalue,
 	int precision,
diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c
index e354bb170..9314bf361 100644
--- a/newlib/libc/stdlib/efgcvt.c
+++ b/newlib/libc/stdlib/efgcvt.c
@@ -103,8 +103,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include "local.h"
 
 char *
-_DEFUN (fcvt, (d, ndigit, decpt, sign),
-	double d,
+fcvt (double d,
 	int ndigit,
 	int *decpt,
 	int *sign)
@@ -113,8 +112,7 @@ _DEFUN (fcvt, (d, ndigit, decpt, sign),
 }
 
 char *
-_DEFUN (fcvtf, (d, ndigit, decpt, sign),
-	float d,
+fcvtf (float d,
 	int ndigit,
 	int *decpt,
 	int *sign)
@@ -124,8 +122,7 @@ _DEFUN (fcvtf, (d, ndigit, decpt, sign),
 
 
 char *
-_DEFUN (gcvtf, (d, ndigit, buf),
-	float d,
+gcvtf (float d,
 	int ndigit,
 	char *buf)
 {
@@ -135,8 +132,7 @@ _DEFUN (gcvtf, (d, ndigit, buf),
 
 
 char *
-_DEFUN (ecvt, (d, ndigit, decpt, sign),
-	double d,
+ecvt (double d,
 	int ndigit,
 	int *decpt,
 	int *sign)
@@ -145,8 +141,7 @@ _DEFUN (ecvt, (d, ndigit, decpt, sign),
 }
 
 char *
-_DEFUN (ecvtf, (d, ndigit, decpt, sign),
-	float d,
+ecvtf (float d,
 	int ndigit,
 	int *decpt,
 	int *sign)
@@ -156,8 +151,7 @@ _DEFUN (ecvtf, (d, ndigit, decpt, sign),
 
 
 char *
-_DEFUN (gcvt, (d, ndigit, buf),
-	double d,
+gcvt (double d,
 	int ndigit,
 	char *buf)
 {
diff --git a/newlib/libc/stdlib/erand48.c b/newlib/libc/stdlib/erand48.c
index a62ff345a..1be4a953e 100644
--- a/newlib/libc/stdlib/erand48.c
+++ b/newlib/libc/stdlib/erand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 double
-_DEFUN (_erand48_r, (r, xseed),
-       struct _reent *r,
+_erand48_r (struct _reent *r,
        unsigned short xseed[3])
 {
   __dorand48(r, xseed);
@@ -26,8 +25,7 @@ _DEFUN (_erand48_r, (r, xseed),
 
 #ifndef _REENT_ONLY
 double
-_DEFUN (erand48, (xseed),
-       unsigned short xseed[3])
+erand48 (unsigned short xseed[3])
 {
   return _erand48_r (_REENT, xseed);
 }
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 8fa949081..95108ade6 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -50,8 +50,7 @@ Supporting OS subroutines required: <<_exit>>.
  */
 
 void
-_DEFUN (exit, (code),
-	int code)
+exit (int code)
 {
 #ifdef _LITE_EXIT
   /* Refer to comments in __atexit.c for more details of lite exit.  */
diff --git a/newlib/libc/stdlib/gdtoa-gethex.c b/newlib/libc/stdlib/gdtoa-gethex.c
index 18d9cc172..939e0dd8d 100644
--- a/newlib/libc/stdlib/gdtoa-gethex.c
+++ b/newlib/libc/stdlib/gdtoa-gethex.c
@@ -59,8 +59,7 @@ const unsigned char __hexdig[256]=
 };
 #else /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
 unsigned char
-_DEFUN (__hexdig_fun, (c),
-		unsigned char c)
+__hexdig_fun (unsigned char c)
 {
 	if(c>='0' && c<='9') return c-'0'+0x10;
 	else if(c>='a' && c<='f') return c-'a'+0x10+10;
@@ -70,8 +69,7 @@ _DEFUN (__hexdig_fun, (c),
 #endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
 
 static void
-_DEFUN(rshift, (b, k),
-	_Bigint *b,
+rshift (_Bigint *b,
 	int k)
 {
 	__ULong *x, *x1, *xe, y;
@@ -101,8 +99,7 @@ _DEFUN(rshift, (b, k),
 }
 
 static _Bigint *
-_DEFUN (increment, (ptr, b),
-	struct _reent *ptr,
+increment (struct _reent *ptr,
 	_Bigint *b)
 {
 	__ULong *x, *xe;
diff --git a/newlib/libc/stdlib/gdtoa-hexnan.c b/newlib/libc/stdlib/gdtoa-hexnan.c
index fa98646f6..a17e5a699 100644
--- a/newlib/libc/stdlib/gdtoa-hexnan.c
+++ b/newlib/libc/stdlib/gdtoa-hexnan.c
@@ -45,8 +45,7 @@ THIS SOFTWARE.
 
 #ifdef INFNAN_CHECK
 int
-_DEFUN (match, (sp, t),
-	const char **sp,
+match (const char **sp,
 	char *t)
 {
 	int c, d;
@@ -63,8 +62,7 @@ _DEFUN (match, (sp, t),
 }
 
 static void
-_DEFUN (L_shift, (x, x1, i),
-	__ULong *x,
+L_shift (__ULong *x,
 	__ULong *x1,
 	int i)
 {
@@ -80,8 +78,7 @@ _DEFUN (L_shift, (x, x1, i),
 }
 
 int
-_DEFUN (hexnan, (sp, fpi, x0),
-	const char **sp,
+hexnan (const char **sp,
 	const FPI *fpi,
 	__ULong *x0)
 {
diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c
index 973a54732..107376bcd 100644
--- a/newlib/libc/stdlib/getenv.c
+++ b/newlib/libc/stdlib/getenv.c
@@ -64,8 +64,7 @@ variables vary from one system to another.
  */
 
 char *
-_DEFUN (_findenv, (name, offset),
-	register const char *name,
+_findenv (register const char *name,
 	int *offset)
 {
   return _findenv_r (_REENT, name, offset);
@@ -77,8 +76,7 @@ _DEFUN (_findenv, (name, offset),
  */
 
 char *
-_DEFUN (getenv, (name),
-	const char *name)
+getenv (const char *name)
 {
   int offset;
 
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index 315d283ea..aac11367c 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -74,8 +74,7 @@ static char ***p_environ = &environ;
  */
 
 char *
-_DEFUN (_findenv_r, (reent_ptr, name, offset),
-        struct _reent *reent_ptr,
+_findenv_r (struct _reent *reent_ptr,
 	register const char *name,
 	int *offset)
 {
@@ -119,8 +118,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset),
  */
 
 char *
-_DEFUN (_getenv_r, (reent_ptr, name),
-        struct _reent *reent_ptr,
+_getenv_r (struct _reent *reent_ptr,
 	const char *name)
 {
   int offset;
diff --git a/newlib/libc/stdlib/itoa.c b/newlib/libc/stdlib/itoa.c
index 25e6c3516..7a7daf0ce 100644
--- a/newlib/libc/stdlib/itoa.c
+++ b/newlib/libc/stdlib/itoa.c
@@ -30,8 +30,7 @@ No supporting OS subroutine calls are required.
 #include <stdlib.h>
 
 char *
-_DEFUN (__itoa, (value, str, base),
-        int value,
+__itoa (int value,
         char *str,
         int base)
 {
@@ -60,8 +59,7 @@ _DEFUN (__itoa, (value, str, base),
 }
 
 char *  
-_DEFUN (itoa, (value, str, base),
-        int value,
+itoa (int value,
         char *str,
         int base)
 {
diff --git a/newlib/libc/stdlib/jrand48.c b/newlib/libc/stdlib/jrand48.c
index 4f8c12bd1..185e0da90 100644
--- a/newlib/libc/stdlib/jrand48.c
+++ b/newlib/libc/stdlib/jrand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 long
-_DEFUN (_jrand48_r, (r, xseed),
-       struct _reent *r,
+_jrand48_r (struct _reent *r,
        unsigned short xseed[3])
 {
   __dorand48(r, xseed);
@@ -24,8 +23,7 @@ _DEFUN (_jrand48_r, (r, xseed),
 
 #ifndef _REENT_ONLY
 long
-_DEFUN (jrand48, (xseed),
-       unsigned short xseed[3])
+jrand48 (unsigned short xseed[3])
 {
   return _jrand48_r (_REENT, xseed);
 }
diff --git a/newlib/libc/stdlib/l64a.c b/newlib/libc/stdlib/l64a.c
index 607842723..45282e32d 100644
--- a/newlib/libc/stdlib/l64a.c
+++ b/newlib/libc/stdlib/l64a.c
@@ -27,15 +27,13 @@
 static const char R64_ARRAY[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 char *
-_DEFUN (l64a, (value),
-     long value)
+l64a (long value)
 {
   return _l64a_r (_REENT, value);
 }
 
 char *
-_DEFUN (_l64a_r, (rptr, value),
-     struct _reent *rptr,
+_l64a_r (struct _reent *rptr,
      long value)
 {
   char *ptr;
diff --git a/newlib/libc/stdlib/labs.c b/newlib/libc/stdlib/labs.c
index 712f56c37..f6761d0cc 100644
--- a/newlib/libc/stdlib/labs.c
+++ b/newlib/libc/stdlib/labs.c
@@ -33,8 +33,7 @@ No supporting OS subroutine calls are required.
 #include <stdlib.h>
 
 long
-_DEFUN (labs, (x),
-	long x)
+labs (long x)
 {
   if (x < 0)
     {
diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c
index a16d49ecc..78e9e5746 100644
--- a/newlib/libc/stdlib/lcong48.c
+++ b/newlib/libc/stdlib/lcong48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 void
-_DEFUN (_lcong48_r, (r, p),
-       struct _reent *r,
+_lcong48_r (struct _reent *r,
        unsigned short p[7])
 {
   _REENT_CHECK_RAND48(r);
@@ -30,8 +29,7 @@ _DEFUN (_lcong48_r, (r, p),
 
 #ifndef _REENT_ONLY
 void
-_DEFUN (lcong48, (p),
-       unsigned short p[7])
+lcong48 (unsigned short p[7])
 {
   _lcong48_r (_REENT, p);
 }
diff --git a/newlib/libc/stdlib/ldiv.c b/newlib/libc/stdlib/ldiv.c
index 00bca6286..294cc8602 100644
--- a/newlib/libc/stdlib/ldiv.c
+++ b/newlib/libc/stdlib/ldiv.c
@@ -82,8 +82,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>		/* ldiv_t */
 
 ldiv_t
-_DEFUN (ldiv, (num, denom),
-        long num,
+ldiv (long num,
         long denom)
 {
 	ldiv_t r;
diff --git a/newlib/libc/stdlib/llabs.c b/newlib/libc/stdlib/llabs.c
index c2a561c38..a020deadf 100644
--- a/newlib/libc/stdlib/llabs.c
+++ b/newlib/libc/stdlib/llabs.c
@@ -54,8 +54,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 
 long long
-_DEFUN(llabs, (j),
-       long long j)
+llabs (long long j)
 {
 	return (j < 0 ? -j : j);
 }
diff --git a/newlib/libc/stdlib/lldiv.c b/newlib/libc/stdlib/lldiv.c
index 8433e76bd..2dadf0e1e 100644
--- a/newlib/libc/stdlib/lldiv.c
+++ b/newlib/libc/stdlib/lldiv.c
@@ -94,8 +94,7 @@ No supporting OS subroutines are required.
  * subtract denom from r.rem.
  */
 lldiv_t
-_DEFUN (lldiv, (number, denom), 
-       long long numer, long long denom)
+lldiv (long long numer, long long denom)
 {
 	lldiv_t retval;
 
diff --git a/newlib/libc/stdlib/lrand48.c b/newlib/libc/stdlib/lrand48.c
index bb3289c83..a28284e61 100644
--- a/newlib/libc/stdlib/lrand48.c
+++ b/newlib/libc/stdlib/lrand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 long
-_DEFUN (_lrand48_r, (r),
-       struct _reent *r)
+_lrand48_r (struct _reent *r)
 {
   _REENT_CHECK_RAND48(r);
   __dorand48(r, __rand48_seed);
diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c
index e7d56bb51..480060c43 100644
--- a/newlib/libc/stdlib/malign.c
+++ b/newlib/libc/stdlib/malign.c
@@ -9,8 +9,7 @@
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (memalign, (align, nbytes),
-	size_t align,
+memalign (size_t align,
 	size_t nbytes)
 {
   return _memalign_r (_REENT, align, nbytes);
diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c
index 5acaa85d3..f5ac29208 100644
--- a/newlib/libc/stdlib/malloc.c
+++ b/newlib/libc/stdlib/malloc.c
@@ -159,15 +159,13 @@ Supporting OS subroutines required: <<sbrk>>.  */
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (malloc, (nbytes),
-	size_t nbytes)		/* get a block */
+malloc (size_t nbytes)		/* get a block */
 {
   return _malloc_r (_REENT, nbytes);
 }
 
 void
-_DEFUN (free, (aptr),
-	void *aptr)
+free (void *aptr)
 {
   _free_r (_REENT, aptr);
 }
diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c
index 3ea91f4ba..3753d3673 100644
--- a/newlib/libc/stdlib/mblen.c
+++ b/newlib/libc/stdlib/mblen.c
@@ -43,8 +43,7 @@ effects vary with the locale.
 #include "local.h"
 
 int
-_DEFUN (mblen, (s, n), 
-        const char *s,
+mblen (const char *s,
         size_t n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/mblen_r.c b/newlib/libc/stdlib/mblen_r.c
index 1456ceae2..ff1737002 100644
--- a/newlib/libc/stdlib/mblen_r.c
+++ b/newlib/libc/stdlib/mblen_r.c
@@ -41,8 +41,7 @@ effects vary with the locale.
 #include "local.h"
 
 int
-_DEFUN (_mblen_r, (r, s, n, state), 
-        struct _reent *r,
+_mblen_r (struct _reent *r,
         const char *s,
         size_t n,
         mbstate_t *state)
diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c
index 4ca2143cf..65284a0eb 100644
--- a/newlib/libc/stdlib/mbrtowc.c
+++ b/newlib/libc/stdlib/mbrtowc.c
@@ -8,8 +8,7 @@
 #include "local.h"
 
 size_t
-_DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
-	struct _reent *ptr,
+_mbrtowc_r (struct _reent *ptr,
 	wchar_t *pwc,
 	const char *s,
 	size_t n,
@@ -42,8 +41,7 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN (mbrtowc, (pwc, s, n, ps),
-	wchar_t *__restrict pwc,
+mbrtowc (wchar_t *__restrict pwc,
 	const char *__restrict s,
 	size_t n,
 	mbstate_t *__restrict ps)
diff --git a/newlib/libc/stdlib/mbsnrtowcs.c b/newlib/libc/stdlib/mbsnrtowcs.c
index 206a0623e..d3ce25084 100644
--- a/newlib/libc/stdlib/mbsnrtowcs.c
+++ b/newlib/libc/stdlib/mbsnrtowcs.c
@@ -71,8 +71,7 @@ PORTABILITY
 #include <errno.h>
 
 size_t
-_DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps), 
-	struct _reent *r,
+_mbsnrtowcs_r (struct _reent *r,
 	wchar_t *dst,
 	const char **src,
 	size_t nms,
@@ -137,8 +136,7 @@ _DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN (mbsnrtowcs, (dst, src, nms, len, ps),
-	wchar_t *__restrict dst,
+mbsnrtowcs (wchar_t *__restrict dst,
 	const char **__restrict src,
 	size_t nms,
 	size_t len,
diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
index 48d36d028..82589c606 100644
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ b/newlib/libc/stdlib/mbsrtowcs.c
@@ -8,8 +8,7 @@
 #include <errno.h>
 
 size_t
-_DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps), 
-	struct _reent *r,
+_mbsrtowcs_r (struct _reent *r,
 	wchar_t *dst,
 	const char **src,
 	size_t len,
@@ -20,8 +19,7 @@ _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN (mbsrtowcs, (dst, src, len, ps),
-	wchar_t *__restrict dst,
+mbsrtowcs (wchar_t *__restrict dst,
 	const char **__restrict src,
 	size_t len,
 	mbstate_t *__restrict ps)
diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index 41ad7b67a..253059cf8 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -47,8 +47,7 @@ effects vary with the locale.
 #include <wchar.h>
 
 size_t
-_DEFUN (mbstowcs, (pwcs, s, n),
-        wchar_t *__restrict pwcs,
+mbstowcs (wchar_t *__restrict pwcs,
         const char *__restrict s,
         size_t n)
 {
diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c
index 7c95e4aba..43aea2cdf 100644
--- a/newlib/libc/stdlib/mbstowcs_r.c
+++ b/newlib/libc/stdlib/mbstowcs_r.c
@@ -3,8 +3,7 @@
 #include "local.h"
 
 size_t
-_DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
-        struct _reent *r,
+_mbstowcs_r (struct _reent *r,
         wchar_t       *__restrict pwcs,
         const char    *__restrict s,
         size_t         n,
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c
index 182884aab..2dc413f2d 100644
--- a/newlib/libc/stdlib/mbtowc.c
+++ b/newlib/libc/stdlib/mbtowc.c
@@ -50,8 +50,7 @@ effects vary with the locale.
 #include "local.h"
 
 int
-_DEFUN (mbtowc, (pwc, s, n),
-        wchar_t *__restrict pwc,
+mbtowc (wchar_t *__restrict pwc,
         const char *__restrict s,
         size_t n)
 {
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
index cbc534a7b..920a7ea3c 100644
--- a/newlib/libc/stdlib/mbtowc_r.c
+++ b/newlib/libc/stdlib/mbtowc_r.c
@@ -8,8 +8,7 @@
 #include "local.h"
 
 int
-_DEFUN (_mbtowc_r, (r, pwc, s, n, state),
-        struct _reent *r,
+_mbtowc_r (struct _reent *r,
         wchar_t       *__restrict pwc,
         const char    *__restrict s,
         size_t         n,
@@ -19,8 +18,7 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
 }
 
 int
-_DEFUN (__ascii_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r,
+__ascii_mbtowc (struct _reent *r,
         wchar_t       *pwc,
         const char    *s,
         size_t         n,
@@ -528,8 +526,7 @@ __cp_mbtowc (int val)
 #endif /* _MB_EXTENDED_CHARSETS_WINDOWS */
 
 int
-_DEFUN (__utf8_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r,
+__utf8_mbtowc (struct _reent *r,
         wchar_t       *pwc,
         const char    *s,
         size_t         n,
@@ -730,8 +727,7 @@ _DEFUN (__utf8_mbtowc, (r, pwc, s, n, state),
    because the underlying OS requires wchar_t == UTF-16. */
 #ifndef  __CYGWIN__
 int
-_DEFUN (__sjis_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r,
+__sjis_mbtowc (struct _reent *r,
         wchar_t       *pwc,
         const char    *s,
         size_t         n,
@@ -787,8 +783,7 @@ _DEFUN (__sjis_mbtowc, (r, pwc, s, n, state),
 }
 
 int
-_DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r,
+__eucjp_mbtowc (struct _reent *r,
         wchar_t       *pwc,
         const char    *s,
         size_t         n,
@@ -870,8 +865,7 @@ _DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state),
 }
 
 int
-_DEFUN (__jis_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r,
+__jis_mbtowc (struct _reent *r,
         wchar_t       *pwc,
         const char    *s,
         size_t         n,
diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c
index bd1c691d9..e433fa8c1 100644
--- a/newlib/libc/stdlib/mprec.c
+++ b/newlib/libc/stdlib/mprec.c
@@ -94,7 +94,7 @@
 */
 
 _Bigint *
-_DEFUN (Balloc, (ptr, k), struct _reent *ptr, int k)
+Balloc (struct _reent *ptr, int k)
 {
   int x;
   _Bigint *rv ;
@@ -133,7 +133,7 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr, int k)
 }
 
 void
-_DEFUN (Bfree, (ptr, v), struct _reent *ptr, _Bigint * v)
+Bfree (struct _reent *ptr, _Bigint * v)
 {
   _REENT_CHECK_MP(ptr);
   if (v)
@@ -144,8 +144,7 @@ _DEFUN (Bfree, (ptr, v), struct _reent *ptr, _Bigint * v)
 }
 
 _Bigint *
-_DEFUN (multadd, (ptr, b, m, a),
-	struct _reent *ptr,
+multadd (struct _reent *ptr,
 	_Bigint * b,
 	int m,
 	int a)
@@ -191,8 +190,7 @@ _DEFUN (multadd, (ptr, b, m, a),
 }
 
 _Bigint *
-_DEFUN (s2b, (ptr, s, nd0, nd, y9),
-	struct _reent * ptr,
+s2b (struct _reent * ptr,
 	const char *s,
 	int nd0,
 	int nd,
@@ -231,8 +229,7 @@ _DEFUN (s2b, (ptr, s, nd0, nd, y9),
 }
 
 int
-_DEFUN (hi0bits,
-	(x), register __ULong x)
+hi0bits (register __ULong x)
 {
   register int k = 0;
 
@@ -266,7 +263,7 @@ _DEFUN (hi0bits,
 }
 
 int
-_DEFUN (lo0bits, (y), __ULong *y)
+lo0bits (__ULong *y)
 {
   register int k;
   register __ULong x = *y;
@@ -316,7 +313,7 @@ _DEFUN (lo0bits, (y), __ULong *y)
 }
 
 _Bigint *
-_DEFUN (i2b, (ptr, i), struct _reent * ptr, int i)
+i2b (struct _reent * ptr, int i)
 {
   _Bigint *b;
 
@@ -327,7 +324,7 @@ _DEFUN (i2b, (ptr, i), struct _reent * ptr, int i)
 }
 
 _Bigint *
-_DEFUN (mult, (ptr, a, b), struct _reent * ptr, _Bigint * a, _Bigint * b)
+mult (struct _reent * ptr, _Bigint * a, _Bigint * b)
 {
   _Bigint *c;
   int k, wa, wb, wc;
@@ -419,8 +416,7 @@ _DEFUN (mult, (ptr, a, b), struct _reent * ptr, _Bigint * a, _Bigint * b)
 }
 
 _Bigint *
-_DEFUN (pow5mult,
-	(ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
+pow5mult (struct _reent * ptr, _Bigint * b, int k)
 {
   _Bigint *b1, *p5, *p51;
   int i;
@@ -459,7 +455,7 @@ _DEFUN (pow5mult,
 }
 
 _Bigint *
-_DEFUN (lshift, (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
+lshift (struct _reent * ptr, _Bigint * b, int k)
 {
   int i, k1, n, n1;
   _Bigint *b1;
@@ -519,7 +515,7 @@ _DEFUN (lshift, (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
 }
 
 int
-_DEFUN (cmp, (a, b), _Bigint * a, _Bigint * b)
+cmp (_Bigint * a, _Bigint * b)
 {
   __ULong *xa, *xa0, *xb, *xb0;
   int i, j;
@@ -549,7 +545,7 @@ _DEFUN (cmp, (a, b), _Bigint * a, _Bigint * b)
 }
 
 _Bigint *
-_DEFUN (diff, (ptr, a, b), struct _reent * ptr,
+diff (struct _reent * ptr,
 	_Bigint * a, _Bigint * b)
 {
   _Bigint *c;
@@ -633,7 +629,7 @@ _DEFUN (diff, (ptr, a, b), struct _reent * ptr,
 }
 
 double
-_DEFUN (ulp, (_x), double _x)
+ulp (double _x)
 {
   union double_union x, a;
   register __Long L;
@@ -679,8 +675,7 @@ _DEFUN (ulp, (_x), double _x)
 }
 
 double
-_DEFUN (b2d, (a, e),
-	_Bigint * a, int *e)
+b2d (_Bigint * a, int *e)
 {
   __ULong *xa, *xa0, w, y, z;
   int k;
@@ -756,9 +751,7 @@ ret_d:
 }
 
 _Bigint *
-_DEFUN (d2b,
-	(ptr, _d, e, bits),
-	struct _reent * ptr,
+d2b (struct _reent * ptr,
 	double _d,
 	int *e,
 	int *bits)
@@ -911,7 +904,7 @@ _DEFUN (d2b,
 #undef d1
 
 double
-_DEFUN (ratio, (a, b), _Bigint * a, _Bigint * b)
+ratio (_Bigint * a, _Bigint * b)
 
 {
   union double_union da, db;
@@ -976,8 +969,7 @@ const double tinytens[] =
 
 
 double
-_DEFUN (_mprec_log10, (dig),
-	int dig)
+_mprec_log10 (int dig)
 {
   double v = 1.0;
   if (dig < 24)
@@ -991,8 +983,7 @@ _DEFUN (_mprec_log10, (dig),
 }
 
 void
-_DEFUN (copybits, (c, n, b),
-	__ULong *c,
+copybits (__ULong *c,
 	int n,
 	_Bigint *b)
 {
@@ -1020,8 +1011,7 @@ _DEFUN (copybits, (c, n, b),
 }
 
 __ULong
-_DEFUN (any_on, (b, k),
-	_Bigint *b,
+any_on (_Bigint *b,
 	int k)
 {
 	int n, nwds;
diff --git a/newlib/libc/stdlib/mrand48.c b/newlib/libc/stdlib/mrand48.c
index 62b44edc9..bb1e454c9 100644
--- a/newlib/libc/stdlib/mrand48.c
+++ b/newlib/libc/stdlib/mrand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 long
-_DEFUN (_mrand48_r, (r),
-       struct _reent *r)
+_mrand48_r (struct _reent *r)
 {
   _REENT_CHECK_RAND48(r);
   __dorand48(r, __rand48_seed);
diff --git a/newlib/libc/stdlib/msize.c b/newlib/libc/stdlib/msize.c
index 8c2b221e4..108550dcd 100644
--- a/newlib/libc/stdlib/msize.c
+++ b/newlib/libc/stdlib/msize.c
@@ -9,8 +9,7 @@
 #ifndef _REENT_ONLY
 
 size_t
-_DEFUN (malloc_usable_size, (ptr),
-	void *ptr)
+malloc_usable_size (void *ptr)
 {
   return _malloc_usable_size_r (_REENT, ptr);
 }
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index 92f9fb792..85c20f1bc 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -97,8 +97,7 @@ malloc_stats (void)
 }
 
 int
-_DEFUN (mallopt, (p, v),
-	int p,
+mallopt (int p,
 	int v)
 {
   return _mallopt_r (_REENT, p, v);
@@ -115,8 +114,7 @@ _DEFUN (mallopt, (p, v),
    malloc_stats.  */
 
 void
-_DEFUN (_mstats_r, (ptr, s),
-	struct _reent *ptr,
+_mstats_r (struct _reent *ptr,
 	char *s)
 {
   _REENT_SMALL_CHECK_INIT(ptr);
@@ -126,8 +124,7 @@ _DEFUN (_mstats_r, (ptr, s),
 
 #ifndef _REENT_ONLY
 void
-_DEFUN (mstats, (s),
-	char *s)
+mstats (char *s)
 {
   _mstats_r (_REENT, s);
 }
diff --git a/newlib/libc/stdlib/mtrim.c b/newlib/libc/stdlib/mtrim.c
index 328eb715e..bf927fa84 100644
--- a/newlib/libc/stdlib/mtrim.c
+++ b/newlib/libc/stdlib/mtrim.c
@@ -9,8 +9,7 @@
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (malloc_trim, (pad),
-	size_t pad)
+malloc_trim (size_t pad)
 {
   return _malloc_trim_r (_REENT, pad);
 }
diff --git a/newlib/libc/stdlib/nrand48.c b/newlib/libc/stdlib/nrand48.c
index 43a6d0cfb..cca0e5f7a 100644
--- a/newlib/libc/stdlib/nrand48.c
+++ b/newlib/libc/stdlib/nrand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 long
-_DEFUN (_nrand48_r, (r, xseed),
-       struct _reent *r,
+_nrand48_r (struct _reent *r,
        unsigned short xseed[3])
 {
   __dorand48 (r, xseed);
@@ -25,8 +24,7 @@ _DEFUN (_nrand48_r, (r, xseed),
 
 #ifndef _REENT_ONLY
 long
-_DEFUN (nrand48, (xseed),
-       unsigned short xseed[3])
+nrand48 (unsigned short xseed[3])
 {
   return _nrand48_r (_REENT, xseed);
 }
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index 97d107e7d..ce6bac68e 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -66,9 +66,7 @@ const void * const __on_exit_dummy = &__on_exit_args;
  */
 
 int
-_DEFUN (on_exit,
-	(fn, arg),
-	void _EXFNPTR(fn, (int, void *)),
+on_exit (void _EXFNPTR(fn, (int, void *)),
         void *arg)
 {
   return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
diff --git a/newlib/libc/stdlib/putenv.c b/newlib/libc/stdlib/putenv.c
index 978f7c5d6..7a8d7f7d3 100644
--- a/newlib/libc/stdlib/putenv.c
+++ b/newlib/libc/stdlib/putenv.c
@@ -23,8 +23,7 @@
 #include <string.h>
 
 int
-_DEFUN (putenv, (str),
-	char *str)
+putenv (char *str)
 {
   return _putenv_r (_REENT, str);
 }
diff --git a/newlib/libc/stdlib/putenv_r.c b/newlib/libc/stdlib/putenv_r.c
index a780a149e..8c23a823d 100644
--- a/newlib/libc/stdlib/putenv_r.c
+++ b/newlib/libc/stdlib/putenv_r.c
@@ -31,8 +31,7 @@
                or replaces the environment variable "name"
                with "value" which is specified by str as "name=value". */
 int
-_DEFUN (_putenv_r, (reent_ptr, str),
-	struct _reent *reent_ptr,
+_putenv_r (struct _reent *reent_ptr,
 	char   *str)
 {
   register char *p, *equal;
diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c
index e6ef7a1f6..209cb32ff 100644
--- a/newlib/libc/stdlib/rand.c
+++ b/newlib/libc/stdlib/rand.c
@@ -59,7 +59,7 @@ on two different systems.
 #include <reent.h>
 
 void
-_DEFUN (srand, (seed), unsigned int seed)
+srand (unsigned int seed)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c
index 0fc5cc0a9..626b3ef84 100644
--- a/newlib/libc/stdlib/rand48.c
+++ b/newlib/libc/stdlib/rand48.c
@@ -130,8 +130,7 @@ No supporting OS subroutines are required.
 #include "rand48.h"
 
 void
-_DEFUN (__dorand48, (r, xseed),
-       struct _reent *r,
+__dorand48 (struct _reent *r,
        unsigned short xseed[3])
 {
   unsigned long accu;
diff --git a/newlib/libc/stdlib/rand_r.c b/newlib/libc/stdlib/rand_r.c
index 437739ef5..0670285a0 100644
--- a/newlib/libc/stdlib/rand_r.c
+++ b/newlib/libc/stdlib/rand_r.c
@@ -22,7 +22,7 @@
 */
       
 int
-_DEFUN (rand_r, (seed), unsigned int *seed)
+rand_r (unsigned int *seed)
 {
         long k;
         long s = (long)(*seed);
diff --git a/newlib/libc/stdlib/random.c b/newlib/libc/stdlib/random.c
index b3b0ca305..131dc056c 100644
--- a/newlib/libc/stdlib/random.c
+++ b/newlib/libc/stdlib/random.c
@@ -57,7 +57,7 @@ algorithm as <<rand>>.
 #include <reent.h>
 
 void
-_DEFUN (srandom, (seed), unsigned int seed)
+srandom (unsigned int seed)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/stdlib/realloc.c b/newlib/libc/stdlib/realloc.c
index 00a88a5a2..999e8e00b 100644
--- a/newlib/libc/stdlib/realloc.c
+++ b/newlib/libc/stdlib/realloc.c
@@ -11,8 +11,7 @@ int _dummy_realloc = 1;
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (realloc, (ap, nbytes),
-	void *ap,
+realloc (void *ap,
 	size_t nbytes)
 {
   return _realloc_r (_REENT, ap, nbytes);
diff --git a/newlib/libc/stdlib/reallocf.c b/newlib/libc/stdlib/reallocf.c
index c4aaeaeaa..d62752a80 100644
--- a/newlib/libc/stdlib/reallocf.c
+++ b/newlib/libc/stdlib/reallocf.c
@@ -31,8 +31,7 @@
 #include <stdlib.h>
 
 void *
-_DEFUN (_reallocf_r, (reentptr, ptr, size),
-	struct _reent *reentptr,
+_reallocf_r (struct _reent *reentptr,
 	void *ptr,
 	size_t size)
 {
@@ -46,8 +45,7 @@ _DEFUN (_reallocf_r, (reentptr, ptr, size),
 
 #ifndef _REENT_ONLY
 void *
-_DEFUN (reallocf, (ptr, size),
-	void *ptr,
+reallocf (void *ptr,
 	size_t size)
 {
   return _reallocf_r(_REENT, ptr, size);
diff --git a/newlib/libc/stdlib/rpmatch.c b/newlib/libc/stdlib/rpmatch.c
index 93d2c3f11..42a351343 100644
--- a/newlib/libc/stdlib/rpmatch.c
+++ b/newlib/libc/stdlib/rpmatch.c
@@ -59,8 +59,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 
 int
-_DEFUN(rpmatch, (response),
-       const char *response)
+rpmatch (const char *response)
 {
 	regex_t yes, no;
 	int ret;
diff --git a/newlib/libc/stdlib/seed48.c b/newlib/libc/stdlib/seed48.c
index 5f3ae2e95..25f0e501e 100644
--- a/newlib/libc/stdlib/seed48.c
+++ b/newlib/libc/stdlib/seed48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 unsigned short *
-_DEFUN (_seed48_r, (r, xseed),
-       struct _reent *r,
+_seed48_r (struct _reent *r,
        unsigned short xseed[3])
 {
   static unsigned short sseed[3];
@@ -36,8 +35,7 @@ _DEFUN (_seed48_r, (r, xseed),
 
 #ifndef _REENT_ONLY
 unsigned short *
-_DEFUN (seed48, (xseed),
-       unsigned short xseed[3])
+seed48 (unsigned short xseed[3])
 {
   return _seed48_r (_REENT, xseed);
 }
diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c
index e68e91d14..b0c1585d4 100644
--- a/newlib/libc/stdlib/setenv.c
+++ b/newlib/libc/stdlib/setenv.c
@@ -32,8 +32,7 @@ extern int _unsetenv_r (struct _reent *, const char *);
  */
 
 int
-_DEFUN (setenv, (name, value, rewrite),
-	const char *name,
+setenv (const char *name,
 	const char *value,
 	int rewrite)
 {
@@ -45,8 +44,7 @@ _DEFUN (setenv, (name, value, rewrite),
  *	Delete environmental variable "name".
  */
 int
-_DEFUN (unsetenv, (name),
-        const char *name)
+unsetenv (const char *name)
 {
   return _unsetenv_r (_REENT, name);
 }
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index 31d4fc70d..f1f885789 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -49,8 +49,7 @@ extern char *_findenv_r (struct _reent *, const char *, int *);
  */
 
 int
-_DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
-        struct _reent *reent_ptr,
+_setenv_r (struct _reent *reent_ptr,
 	const char *name,
 	const char *value,
 	int rewrite)
@@ -133,8 +132,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
  *	Delete environmental variable "name".
  */
 int
-_DEFUN (_unsetenv_r, (reent_ptr, name),
-        struct _reent *reent_ptr,
+_unsetenv_r (struct _reent *reent_ptr,
         const char *name)
 {
   register char **P;
diff --git a/newlib/libc/stdlib/srand48.c b/newlib/libc/stdlib/srand48.c
index 1eac2a11f..573f62018 100644
--- a/newlib/libc/stdlib/srand48.c
+++ b/newlib/libc/stdlib/srand48.c
@@ -14,8 +14,7 @@
 #include "rand48.h"
 
 void
-_DEFUN (_srand48_r, (r, seed),
-       struct _reent *r,
+_srand48_r (struct _reent *r,
        long seed)
 {
   _REENT_CHECK_RAND48(r);
@@ -30,8 +29,7 @@ _DEFUN (_srand48_r, (r, seed),
 
 #ifndef _REENT_ONLY
 void
-_DEFUN (srand48, (seed),
-       long seed)
+srand48 (long seed)
 {
   _srand48_r (_REENT, seed);
 }
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 1abff4fe2..402510cdf 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -174,8 +174,7 @@ static const double tinytens[] = { 1e-16, 1e-32,
 
 #ifdef Avoid_Underflow /*{*/
  static double
-_DEFUN (sulp, (x, scale),
-       	U x,
+sulp (U x,
 	int scale)
 {
         U u;
@@ -197,8 +196,7 @@ _DEFUN (sulp, (x, scale),
 #ifndef NO_HEX_FP
 
 static void
-_DEFUN (ULtod, (L, bits, exp, k),
-	__ULong *L,
+ULtod (__ULong *L,
 	__ULong *bits,
 	Long exp,
 	int k)
@@ -1252,8 +1250,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
 }
 
 double
-_DEFUN (_strtod_r, (ptr, s00, se),
-	struct _reent *ptr,
+_strtod_r (struct _reent *ptr,
 	const char *__restrict s00,
 	char **__restrict se)
 {
@@ -1269,8 +1266,7 @@ strtod_l (const char *__restrict s00, char **__restrict se, locale_t loc)
 }
 
 double
-_DEFUN (strtod, (s00, se),
-	const char *__restrict s00, char **__restrict se)
+strtod (const char *__restrict s00, char **__restrict se)
 {
   return _strtod_l (_REENT, s00, se, __get_current_locale ());
 }
@@ -1290,8 +1286,7 @@ strtof_l (const char *__restrict s00, char **__restrict se, locale_t loc)
 }
 
 float
-_DEFUN (strtof, (s00, se),
-	const char *__restrict s00,
+strtof (const char *__restrict s00,
 	char **__restrict se)
 {
   double val = _strtod_l (_REENT, s00, se, __get_current_locale ());
diff --git a/newlib/libc/stdlib/strtol.c b/newlib/libc/stdlib/strtol.c
index a366680e4..f7572b169 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -212,8 +212,7 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
 }
 
 long
-_DEFUN (_strtol_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_strtol_r (struct _reent *rptr,
 	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
@@ -231,8 +230,7 @@ strtol_l (const char *__restrict s, char **__restrict ptr, int base,
 }
 
 long
-_DEFUN (strtol, (s, ptr, base),
-	const char *__restrict s,
+strtol (const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 9fc832393..295886e8f 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -214,8 +214,7 @@ _strtoll_l (struct _reent *rptr, const char *__restrict nptr,
 }
 
 long long
-_DEFUN (_strtoll_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_strtoll_r (struct _reent *rptr,
 	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
@@ -233,8 +232,7 @@ strtoll_l (const char *__restrict s, char **__restrict ptr, int base,
 }
 
 long long
-_DEFUN (strtoll, (s, ptr, base),
-	const char *__restrict s,
+strtoll (const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index 5a816dab1..f2fba37f2 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -191,8 +191,7 @@ _strtoul_l (struct _reent *rptr, const char *__restrict nptr,
 }
 
 unsigned long
-_DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_strtoul_r (struct _reent *rptr,
 	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
@@ -210,8 +209,7 @@ strtoul_l (const char *__restrict s, char **__restrict ptr, int base,
 }
 
 unsigned long
-_DEFUN (strtoul, (s, ptr, base),
-	const char *__restrict s,
+strtoul (const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index 0f7c9e385..ce4de6e7e 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -189,8 +189,7 @@ _strtoull_l (struct _reent *rptr, const char *__restrict nptr,
 }
 
 unsigned long long
-_DEFUN (_strtoull_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_strtoull_r (struct _reent *rptr,
 	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
@@ -208,8 +207,7 @@ strtoull_l (const char *__restrict s, char **__restrict ptr, int base,
 }
 
 unsigned long long
-_DEFUN (strtoull, (s, ptr, base),
-	const char *__restrict s,
+strtoull (const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index 0df7d60d3..34be6cd8f 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -57,8 +57,7 @@ static int _EXFUN(do_system, (struct _reent *ptr, const char *s));
 #endif
 
 int
-_DEFUN(_system_r, (ptr, s),
-     struct _reent *ptr,
+_system_r (struct _reent *ptr,
      const char *s)
 {
 #if defined(HAVE_SYSTEM)
@@ -93,8 +92,7 @@ _DEFUN(_system_r, (ptr, s),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(system, (s),
-     const char *s)
+system (const char *s)
 {
   return _system_r (_REENT, s);
 }
@@ -110,8 +108,7 @@ extern char **environ;
 static char ***p_environ = &environ;
 
 static int
-_DEFUN(do_system, (ptr, s),
-     struct _reent *ptr,
+do_system (struct _reent *ptr,
      const char *s)
 {
   char *argv[4];
@@ -142,8 +139,7 @@ _DEFUN(do_system, (ptr, s),
 
 #if defined (__CYGWIN__)
 static int
-_DEFUN(do_system, (ptr, s),
-     struct _reent *ptr,
+do_system (struct _reent *ptr,
      const char *s)
 {
   char *argv[4];
diff --git a/newlib/libc/stdlib/utoa.c b/newlib/libc/stdlib/utoa.c
index cc5440783..5ef304ce4 100644
--- a/newlib/libc/stdlib/utoa.c
+++ b/newlib/libc/stdlib/utoa.c
@@ -28,8 +28,7 @@ No supporting OS subroutine calls are required.
 #include <stdlib.h>
 
 char *
-_DEFUN (__utoa, (value, str, base),
-        unsigned value,
+__utoa (unsigned value,
         char *str,
         int base)
 {
@@ -67,8 +66,7 @@ _DEFUN (__utoa, (value, str, base),
 }
 
 char *  
-_DEFUN (utoa, (value, str, base),
-        unsigned value,
+utoa (unsigned value,
         char *str,
         int base)
 {
diff --git a/newlib/libc/stdlib/valloc.c b/newlib/libc/stdlib/valloc.c
index 83a839e31..025386663 100644
--- a/newlib/libc/stdlib/valloc.c
+++ b/newlib/libc/stdlib/valloc.c
@@ -9,15 +9,13 @@
 #ifndef _REENT_ONLY
 
 void *
-_DEFUN (valloc, (nbytes),
-	size_t nbytes)
+valloc (size_t nbytes)
 {
   return _valloc_r (_REENT, nbytes);
 }
 
 void *
-_DEFUN (pvalloc, (nbytes),
-	size_t nbytes)
+pvalloc (size_t nbytes)
 {
   return _pvalloc_r (_REENT, nbytes);
 }
diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c
index 3b6cbd62c..97436cb74 100644
--- a/newlib/libc/stdlib/wcrtomb.c
+++ b/newlib/libc/stdlib/wcrtomb.c
@@ -7,8 +7,7 @@
 #include "local.h"
 
 size_t
-_DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
-	struct _reent *ptr,
+_wcrtomb_r (struct _reent *ptr,
 	char *s,
 	wchar_t wc,
 	mbstate_t *ps)
@@ -41,8 +40,7 @@ _DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN (wcrtomb, (s, wc, ps),
-	char *__restrict s,
+wcrtomb (char *__restrict s,
 	wchar_t wc,
 	mbstate_t *__restrict ps)
 {
diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c
index 3561257cb..43dd2f3e6 100644
--- a/newlib/libc/stdlib/wcsnrtombs.c
+++ b/newlib/libc/stdlib/wcsnrtombs.c
@@ -138,8 +138,7 @@ _wcsnrtombs_l (struct _reent *r, char *dst, const wchar_t **src, size_t nwc,
 } 
 
 size_t
-_DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps),
-	struct _reent *r,
+_wcsnrtombs_r (struct _reent *r,
 	char *dst,
 	const wchar_t **src,
 	size_t nwc,
@@ -152,8 +151,7 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN (wcsnrtombs, (dst, src, nwc, len, ps),
-	char *__restrict dst,
+wcsnrtombs (char *__restrict dst,
 	const wchar_t **__restrict src,
 	size_t nwc,
 	size_t len,
diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c
index ac0c9dece..dc4807d2a 100644
--- a/newlib/libc/stdlib/wcsrtombs.c
+++ b/newlib/libc/stdlib/wcsrtombs.c
@@ -5,8 +5,7 @@
 #include <wchar.h>
 
 size_t
-_DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
-	struct _reent *r,
+_wcsrtombs_r (struct _reent *r,
 	char *dst,
 	const wchar_t **src,
 	size_t len,
@@ -17,8 +16,7 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
 
 #ifndef _REENT_ONLY
 size_t
-_DEFUN (wcsrtombs, (dst, src, len, ps),
-	char *__restrict dst,
+wcsrtombs (char *__restrict dst,
 	const wchar_t **__restrict src,
 	size_t len,
 	mbstate_t *__restrict ps)
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 8a72e6fe3..9e0d563ef 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -214,8 +214,7 @@ _wcstod_l (struct _reent *ptr, const wchar_t *nptr, wchar_t **endptr,
 }
 
 double
-_DEFUN (_wcstod_r, (ptr, nptr, endptr),
-	struct _reent *ptr,
+_wcstod_r (struct _reent *ptr,
 	const wchar_t *nptr,
 	wchar_t **endptr)
 {
@@ -223,8 +222,7 @@ _DEFUN (_wcstod_r, (ptr, nptr, endptr),
 }
 
 float
-_DEFUN (_wcstof_r, (ptr, nptr, endptr),
-	struct _reent *ptr,
+_wcstof_r (struct _reent *ptr,
 	const wchar_t *nptr,
 	wchar_t **endptr)
 {
@@ -244,8 +242,7 @@ wcstod_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
 }
 
 double
-_DEFUN (wcstod, (nptr, endptr),
-	const wchar_t *__restrict nptr, wchar_t **__restrict endptr)
+wcstod (const wchar_t *__restrict nptr, wchar_t **__restrict endptr)
 {
   return _wcstod_l (_REENT, nptr, endptr, __get_current_locale ());
 }
@@ -266,8 +263,7 @@ wcstof_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
 }
 
 float
-_DEFUN (wcstof, (nptr, endptr),
-	const wchar_t *__restrict nptr,
+wcstof (const wchar_t *__restrict nptr,
 	wchar_t **__restrict endptr)
 {
   double val = _wcstod_l (_REENT, nptr, endptr, __get_current_locale ());
diff --git a/newlib/libc/stdlib/wcstol.c b/newlib/libc/stdlib/wcstol.c
index 324d75ee1..023a9c45e 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -213,8 +213,7 @@ _wcstol_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 }
 
 long
-_DEFUN (_wcstol_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_wcstol_r (struct _reent *rptr,
 	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
@@ -232,8 +231,7 @@ wcstol_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 }
 
 long
-_DEFUN (wcstol, (s, ptr, base),
-	const wchar_t *__restrict s,
+wcstol (const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index 00db2adf0..5fe0b2976 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -213,8 +213,7 @@ _wcstoll_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 }
 
 long long
-_DEFUN (_wcstoll_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_wcstoll_r (struct _reent *rptr,
 	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
@@ -232,8 +231,7 @@ wcstoll_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 }
 
 long long
-_DEFUN (wcstoll, (s, ptr, base),
-	const wchar_t *__restrict s,
+wcstoll (const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c
index 6df2dac55..42be54055 100644
--- a/newlib/libc/stdlib/wcstombs.c
+++ b/newlib/libc/stdlib/wcstombs.c
@@ -48,8 +48,7 @@ effects vary with the locale.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcstombs, (s, pwcs, n),
-        char          *__restrict s,
+wcstombs (char          *__restrict s,
         const wchar_t *__restrict pwcs,
         size_t         n)
 {
diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c
index d965dc228..c6a06a39a 100644
--- a/newlib/libc/stdlib/wcstombs_r.c
+++ b/newlib/libc/stdlib/wcstombs_r.c
@@ -3,8 +3,7 @@
 #include "local.h"
 
 size_t
-_DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
-        struct _reent *r,
+_wcstombs_r (struct _reent *r,
         char          *__restrict s,
         const wchar_t *__restrict pwcs,
         size_t         n,
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index 5c54ec591..8e2796587 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -192,8 +192,7 @@ _wcstoul_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 }
 
 unsigned long
-_DEFUN (_wcstoul_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_wcstoul_r (struct _reent *rptr,
 	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
@@ -211,8 +210,7 @@ wcstoul_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 }
 
 unsigned long
-_DEFUN (wcstoul, (s, ptr, base),
-	const wchar_t *__restrict s,
+wcstoul (const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 4724d6150..5a37473e0 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -208,8 +208,7 @@ _wcstoull_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 }
 
 unsigned long long
-_DEFUN (_wcstoull_r, (rptr, nptr, endptr, base),
-	struct _reent *rptr,
+_wcstoull_r (struct _reent *rptr,
 	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
@@ -227,8 +226,7 @@ wcstoull_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 }
 
 unsigned long long
-_DEFUN (wcstoull, (s, ptr, base),
-	const wchar_t *__restrict s,
+wcstoull (const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c
index b68a43ba7..e908d22c2 100644
--- a/newlib/libc/stdlib/wctomb.c
+++ b/newlib/libc/stdlib/wctomb.c
@@ -46,8 +46,7 @@ effects vary with the locale.
 #include "local.h"
 
 int
-_DEFUN (wctomb, (s, wchar),
-        char *s,
+wctomb (char *s,
         wchar_t wchar)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/wctomb_r.c b/newlib/libc/stdlib/wctomb_r.c
index 7c4fac1e4..b4799341e 100644
--- a/newlib/libc/stdlib/wctomb_r.c
+++ b/newlib/libc/stdlib/wctomb_r.c
@@ -7,8 +7,7 @@
 #include "local.h"
 
 int
-_DEFUN (_wctomb_r, (r, s, wchar, state),
-        struct _reent *r,
+_wctomb_r (struct _reent *r,
         char          *s,
         wchar_t        _wchar,
         mbstate_t     *state)
@@ -17,8 +16,7 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
 }
 
 int
-_DEFUN (__ascii_wctomb, (r, s, wchar, state),
-        struct _reent *r,
+__ascii_wctomb (struct _reent *r,
         char          *s,
         wchar_t        _wchar,
         mbstate_t     *state)
@@ -50,8 +48,7 @@ _DEFUN (__ascii_wctomb, (r, s, wchar, state),
 #define __state __count
 
 int
-_DEFUN (__utf8_wctomb, (r, s, wchar, state),
-        struct _reent *r,
+__utf8_wctomb (struct _reent *r,
         char          *s,
         wchar_t        _wchar,
         mbstate_t     *state)
@@ -144,8 +141,7 @@ _DEFUN (__utf8_wctomb, (r, s, wchar, state),
    because the underlying OS requires wchar_t == UTF-16. */
 #ifndef __CYGWIN__
 int
-_DEFUN (__sjis_wctomb, (r, s, wchar, state),
-        struct _reent *r,
+__sjis_wctomb (struct _reent *r,
         char          *s,
         wchar_t        _wchar,
         mbstate_t     *state)
@@ -178,8 +174,7 @@ _DEFUN (__sjis_wctomb, (r, s, wchar, state),
 }
 
 int
-_DEFUN (__eucjp_wctomb, (r, s, wchar, state),
-        struct _reent *r,
+__eucjp_wctomb (struct _reent *r,
         char          *s,
         wchar_t        _wchar,
         mbstate_t     *state)
@@ -218,8 +213,7 @@ _DEFUN (__eucjp_wctomb, (r, s, wchar, state),
 }
 
 int
-_DEFUN (__jis_wctomb, (r, s, wchar, state),
-        struct _reent *r,
+__jis_wctomb (struct _reent *r,
         char          *s,
         wchar_t        _wchar,
         mbstate_t     *state)
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 29afe828c..747f8af51 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -32,8 +32,7 @@ QUICKREF
 #include <strings.h>
 
 int
-_DEFUN (bcmp, (m1, m2, n),
-	const void *m1,
+bcmp (const void *m1,
 	const void *m2,
 	size_t n)
 
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index d6cb0c97a..d8bdeb57f 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -24,8 +24,7 @@ QUICKREF
 #include <strings.h>
 
 void
-_DEFUN (bcopy, (b1, b2, length),
-	const void *b1,
+bcopy (const void *b1,
 	void *b2,
 	size_t length)
 {
diff --git a/newlib/libc/string/gnu_basename.c b/newlib/libc/string/gnu_basename.c
index 90e22ccdf..c43542599 100644
--- a/newlib/libc/string/gnu_basename.c
+++ b/newlib/libc/string/gnu_basename.c
@@ -14,8 +14,7 @@
 #include <string.h>
 
 char *
-_DEFUN (__gnu_basename, (path),
-	const char *path)
+__gnu_basename (const char *path)
 {
   char *p;
   if ((p = strrchr (path, '/')))
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 13519b435..4a6788512 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -31,8 +31,7 @@ QUICKREF
 #include <strings.h>
 
 char *
-_DEFUN (index, (s, c),
-	const char *s,
+index (const char *s,
 	int c)
 {
   return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 9b94061cb..1f5f55c50 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -56,8 +56,7 @@ PORTABILITY
 
 
 void *
-_DEFUN (memccpy, (dst0, src0, endchar, len0),
-	void *__restrict dst0,
+memccpy (void *__restrict dst0,
 	const void *__restrict src0,
 	int endchar0,
 	size_t len0)
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 91f0b3788..21bc4d879 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -62,8 +62,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 void *
-_DEFUN (memchr, (src_void, c, length),
-	const void *src_void,
+memchr (const void *src_void,
 	int c,
 	size_t length)
 {
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index c05cf5745..342fb9fbc 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -43,8 +43,7 @@ QUICKREF
 #define TOO_SMALL(LEN)  ((LEN) < LBLOCKSIZE)
 
 int
-_DEFUN (memcmp, (m1, m2, n),
-	const void *m1,
+memcmp (const void *m1,
 	const void *m2,
 	size_t n)
 {
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index e1ae0ffe9..a1cff12d9 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -44,8 +44,7 @@ QUICKREF
 #define TOO_SMALL(LEN)  ((LEN) < BIGBLOCKSIZE)
 
 void *
-_DEFUN (memcpy, (dst0, src0, len0),
-	void *__restrict dst0,
+memcpy (void *__restrict dst0,
 	const void *__restrict src0,
 	size_t len0)
 {
diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c
index 5588b9f59..5c57eff9c 100644
--- a/newlib/libc/string/memmem.c
+++ b/newlib/libc/string/memmem.c
@@ -46,8 +46,7 @@ QUICKREF
 #endif
 
 void *
-_DEFUN (memmem, (haystack_start, haystack_len, needle_start, needle_len),
-	const void *haystack_start,
+memmem (const void *haystack_start,
 	size_t haystack_len,
 	const void *needle_start,
 	size_t needle_len)
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index 70adb836c..da5dfdbdd 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -50,8 +50,7 @@ QUICKREF
 /*SUPPRESS 20*/
 void *
 __inhibit_loop_to_libcall
-_DEFUN (memmove, (dst_void, src_void, length),
-	void *dst_void,
+memmove (void *dst_void,
 	const void *src_void,
 	size_t length)
 {
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index babaea006..129165603 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -43,8 +43,7 @@ PORTABILITY
 #define TOO_SMALL(LEN)  ((LEN) < BIGBLOCKSIZE)
 
 void *
-_DEFUN (mempcpy, (dst0, src0, len0),
-	void *dst0,
+mempcpy (void *dst0,
 	const void *src0,
 	size_t len0)
 {
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 432f46212..652efb359 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -62,8 +62,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 void *
-_DEFUN (memrchr, (src_void, c, length),
-	const void *src_void,
+memrchr (const void *src_void,
 	int c,
 	size_t length)
 {
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index 5ce15c5aa..e8e667a24 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -35,8 +35,7 @@ QUICKREF
 
 void *
 __inhibit_loop_to_libcall
-_DEFUN (memset, (m, c, n),
-	void *m,
+memset (void *m,
 	int c,
 	size_t n)
 {
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 881bd231a..56e2b5e2d 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -61,8 +61,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 void *
-_DEFUN (rawmemchr, (src_void, c),
-	const void *src_void,
+rawmemchr (const void *src_void,
 	int c)
 {
   const unsigned char *src = (const unsigned char *) src_void;
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index 0c7f153cf..39e5aa2da 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -31,8 +31,7 @@ QUICKREF
 #include <strings.h>
 
 char *
-_DEFUN (rindex, (s, c),
-	const char *s,
+rindex (const char *s,
 	int c)
 {
   return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 3933036cc..4e2ae9fe0 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -53,8 +53,7 @@ QUICKREF
 #endif
 
 char*
-_DEFUN (stpcpy, (dst, src),
-	char *__restrict dst,
+stpcpy (char *__restrict dst,
 	const char *__restrict src)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index 69fa8515a..87fe268cf 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -61,8 +61,7 @@ QUICKREF
 #define TOO_SMALL(LEN) ((LEN) < sizeof (long))
 
 char *
-_DEFUN (stpncpy, (dst, src),
-	char *__restrict dst,
+stpncpy (char *__restrict dst,
 	const char *__restrict src,
 	size_t count)
 {
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 4a48aa69a..c75a3e20d 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -36,8 +36,7 @@ QUICKREF
 #include <ctype.h>
 
 int
-_DEFUN (strcasecmp, (s1, s2),
-	const char *s1,
+strcasecmp (const char *s1,
 	const char *s2)
 {
   int d = 0;
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 1cc5f6ed7..36e183986 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -90,8 +90,7 @@ QUICKREF
  * Find the first occurrence of find in s, ignore case.
  */
 char *
-_DEFUN (strcasestr, (s, find),
-	const char *s,
+strcasestr (const char *s,
 	const char *find)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index ac9bb8e15..92313c492 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -54,8 +54,7 @@ QUICKREF
 /*SUPPRESS 530*/
 
 char *
-_DEFUN (strcat, (s1, s2),
-	char *__restrict s1,
+strcat (char *__restrict s1,
 	const char *__restrict s2)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index 05503d178..96f30be04 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -52,8 +52,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 char *
-_DEFUN (strchr, (s1, i),
-	const char *s1,
+strchr (const char *s1,
 	int i)
 {
   const unsigned char *s = (const unsigned char *)s1;
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 14fd4e2ec..f5c3eb25d 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -31,8 +31,7 @@ QUICKREF
 #include <string.h>
 
 char *
-_DEFUN (strchrnul, (s1, i),
-	const char *s1,
+strchrnul (const char *s1,
 	int i)
 {
   char *s = strchr(s1, i);
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index 6c1a0386d..894424a69 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -52,8 +52,7 @@ QUICKREF
 #endif
 
 int
-_DEFUN (strcmp, (s1, s2),
-	const char *s1,
+strcmp (const char *s1,
 	const char *s2)
 { 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index fae999a64..7fa8d1373 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -36,8 +36,7 @@ QUICKREF
 #include <string.h>
 
 int
-_DEFUN (strcoll, (a, b),
-	const char *a,
+strcoll (const char *a,
 	const char *b)
 
 {
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 3505b800a..94e16b512 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -52,8 +52,7 @@ QUICKREF
 #endif
 
 char*
-_DEFUN (strcpy, (dst0, src0),
-	char *dst0,
+strcpy (char *dst0,
 	const char *src0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index 589054bae..abaa93ad6 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -26,8 +26,7 @@ PORTABILITY
 #include <string.h>
 
 size_t
-_DEFUN (strcspn, (s1, s2),
-	const char *s1,
+strcspn (const char *s1,
 	const char *s2)
 {
   const char *s = s1;
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/string/strdup.c
index 6ea2dd570..3f2a0264c 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/string/strdup.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 char *
-_DEFUN (strdup, (str), const char *str)
+strdup (const char *str)
 {
   return _strdup_r (_REENT, str);
 }
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index 9cdee80f4..14c80f73f 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -3,8 +3,7 @@
 #include <string.h>
 
 char *
-_DEFUN (_strdup_r, (reent_ptr, str), 
-        struct _reent *reent_ptr,
+_strdup_r (struct _reent *reent_ptr,
         const char   *str)
 {
   size_t len = strlen (str) + 1;
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index 8d5c188f8..c1b934696 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -385,8 +385,7 @@ QUICKREF
 #include <string.h>
 
 char *
-_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
-	struct _reent *ptr,
+_strerror_r (struct _reent *ptr,
 	int errnum,
 	int internal,
 	int *errptr)
@@ -893,8 +892,7 @@ _DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
 }
 
 char *
-_DEFUN(strerror, (int),
-       int errnum)
+strerror (int errnum)
 {
   return _strerror_r (_REENT, errnum, 0, NULL);
 }
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index c888f9ff3..660fee869 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -65,8 +65,7 @@ a non-empty alternate string without assigning into its third argument.
 /* For backwards-compatible linking, this must be the GNU signature;
    see xpg_strerror_r.c for the POSIX version.  */
 char *
-_DEFUN (strerror_r, (errnum, buffer, n),
-	int errnum,
+strerror_r (int errnum,
 	char *buffer,
 	size_t n)
 {
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index 2f99294af..a91c297c5 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -42,8 +42,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
  * If retval >= siz, truncation occurred.
  */
 size_t
-_DEFUN (strlcat, (dst, src, siz),
-	char *dst,
+strlcat (char *dst,
 	const char *src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index 2dffed5e3..63ba31ce9 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -40,8 +40,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 size_t
-_DEFUN (strlcpy, (dst, src, siz),
-	char *dst,
+strlcpy (char *dst,
 	const char *src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index df76d5fc2..acffa49e1 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -49,8 +49,7 @@ QUICKREF
 #endif
 
 size_t
-_DEFUN (strlen, (str),
-	const char *str)
+strlen (const char *str)
 {
   const char *start = str;
 
diff --git a/newlib/libc/string/strlwr.c b/newlib/libc/string/strlwr.c
index c47ff4859..7211c5917 100644
--- a/newlib/libc/string/strlwr.c
+++ b/newlib/libc/string/strlwr.c
@@ -29,8 +29,7 @@ QUICKREF
 #include <ctype.h>
 
 char *
-_DEFUN (strlwr, (s),
-	char *s)
+strlwr (char *s)
 {
   unsigned char *ucs = (unsigned char *) s;
   for ( ; *ucs != '\0'; ucs++)
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index 2a6f6265d..09dd98bf5 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -37,8 +37,7 @@ QUICKREF
 #include <ctype.h>
 
 int 
-_DEFUN (strncasecmp, (s1, s2, n),
-	const char *s1,
+strncasecmp (const char *s1,
 	const char *s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 2411cf124..7351913f9 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -58,8 +58,7 @@ QUICKREF
 #endif
 
 char *
-_DEFUN (strncat, (s1, s2, n),
-	char *__restrict s1,
+strncat (char *__restrict s1,
 	const char *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 685d19290..16f8a7729 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -52,8 +52,7 @@ QUICKREF
 #endif
 
 int 
-_DEFUN (strncmp, (s1, s2, n),
-	const char *s1,
+strncmp (const char *s1,
 	const char *s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index abbe43bc7..e7eb34d72 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -59,8 +59,7 @@ QUICKREF
 #define TOO_SMALL(LEN) ((LEN) < sizeof (long))
 
 char *
-_DEFUN (strncpy, (dst0, src0),
-	char *__restrict dst0,
+strncpy (char *__restrict dst0,
 	const char *__restrict src0,
 	size_t count)
 {
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index c241ca544..3ac890a8c 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -6,8 +6,7 @@
 #include <string.h>
 
 char *
-_DEFUN (strndup, (str, n), 
-	const char *str,
+strndup (const char *str,
 	size_t n)
 {
   return _strndup_r (_REENT, str, n);
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index 3c7e8ee4f..1b6cf84e5 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -3,8 +3,7 @@
 #include <string.h>
 
 char *
-_DEFUN (_strndup_r, (reent_ptr, str, n), 
-        struct _reent *reent_ptr,
+_strndup_r (struct _reent *reent_ptr,
         const char   *str,
         size_t n)
 {
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 42f460fea..3ee18d1c0 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -30,8 +30,7 @@ PORTABILITY
 #include <string.h>
 
 size_t
-_DEFUN (strnlen, (str, n),
-	const char *str,
+strnlen (const char *str,
 	size_t n)
 {
   const char *start = str;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index f70efc1ea..774db1e6d 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -25,8 +25,7 @@ PORTABILITY
 #include <string.h>
 
 char *
-_DEFUN (strpbrk, (s1, s2),
-	const char *s1,
+strpbrk (const char *s1,
 	const char *s2)
 {
   const char *c = s2;
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 4aafd509a..04897e162 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -30,8 +30,7 @@ QUICKREF
 #include <string.h>
 
 char *
-_DEFUN (strrchr, (s, i),
-	const char *s,
+strrchr (const char *s,
 	int i)
 {
   const char *last = NULL;
diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c
index e59782795..e1262ac37 100644
--- a/newlib/libc/string/strsep.c
+++ b/newlib/libc/string/strsep.c
@@ -11,8 +11,7 @@
 extern char *__strtok_r (char *, const char *, char **, int);
 
 char *
-_DEFUN (strsep, (source_ptr, delim),
-	register char **source_ptr,
+strsep (register char **source_ptr,
 	register const char *delim)
 {
 	return __strtok_r (*source_ptr, delim, source_ptr, 0);
diff --git a/newlib/libc/string/strsignal.c b/newlib/libc/string/strsignal.c
index 86a0e5dd9..544857b14 100644
--- a/newlib/libc/string/strsignal.c
+++ b/newlib/libc/string/strsignal.c
@@ -53,8 +53,7 @@ QUICKREF
 #include <reent.h>
 
 char *
-_DEFUN (strsignal, (signal),
-	int signal)
+strsignal (int signal)
 {
   char *buffer;
   struct _reent *ptr;
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 22ccd0bf8..baf239947 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -30,8 +30,7 @@ QUICKREF
 #include <string.h>
 
 size_t
-_DEFUN (strspn, (s1, s2),
-	const char *s1,
+strspn (const char *s1,
 	const char *s2)
 {
   const char *s = s1;
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 749edbce6..580ad6272 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -39,8 +39,7 @@ QUICKREF
 #endif
 
 char *
-_DEFUN (strstr, (searchee, lookfor),
-	const char *searchee,
+strstr (const char *searchee,
 	const char *lookfor)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index 92c801731..801f51aca 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -79,8 +79,7 @@ QUICKREF
 extern char *__strtok_r (char *, const char *, char **, int);
 
 char *
-_DEFUN (strtok, (s, delim),
-	register char *__restrict s,
+strtok (register char *__restrict s,
 	register const char *__restrict delim)
 {
 	struct _reent *reent = _REENT;
diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c
index 0d01dcaad..d17fd693d 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -30,8 +30,7 @@
 #include <string.h>
 
 char *
-_DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
-	register char *s,
+__strtok_r (register char *s,
 	register const char *delim,
 	char **lasts,
 	int skip_leading_delim)
@@ -90,8 +89,7 @@ cont:
 }
 
 char *
-_DEFUN (strtok_r, (s, delim, lasts),
-	register char *__restrict s,
+strtok_r (register char *__restrict s,
 	register const char *__restrict delim,
 	char **__restrict lasts)
 {
diff --git a/newlib/libc/string/strupr.c b/newlib/libc/string/strupr.c
index dbec79e46..a175d5c57 100644
--- a/newlib/libc/string/strupr.c
+++ b/newlib/libc/string/strupr.c
@@ -29,8 +29,7 @@ QUICKREF
 #include <ctype.h>
 
 char *
-_DEFUN (strupr, (s),
-	char *s)
+strupr (char *s)
 {
   unsigned char *ucs = (unsigned char *) s;
   for ( ; *ucs != '\0'; ucs++)
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index 13c51becf..c5df0bcd5 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -46,8 +46,7 @@ QUICKREF
 #include <string.h>
 
 size_t
-_DEFUN (strxfrm, (s1, s2, n),
-	char *__restrict s1,
+strxfrm (char *__restrict s1,
 	const char *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index 1c14a4c48..28ab978bd 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -18,8 +18,7 @@ PORTABILITY
 #include <unistd.h>
 
 void
-_DEFUN (swab, (b1, b2, length),
-	const void *b1,
+swab (const void *b1,
 	void *b2,
 	ssize_t length)
 {
diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c
index 174d9170f..cde05adb2 100644
--- a/newlib/libc/string/u_strerr.c
+++ b/newlib/libc/string/u_strerr.c
@@ -1,8 +1,7 @@
 #include <_ansi.h>
 
 char *
-_DEFUN(_user_strerror, (errnum, internal, errptr),
-       int errnum,
+_user_strerror (int errnum,
        int internal,
        int *errptr)
 {
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index 942fad19c..76c5311f1 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -26,8 +26,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcpcpy, (s1, s2),
-	wchar_t *__restrict s1,
+wcpcpy (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2)
 {
   while ((*s1++ = *s2++))
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index 11f4d7c1f..d4e8bcfcd 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -33,8 +33,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcpncpy, (dst, src, count),
-	wchar_t *__restrict dst,
+wcpncpy (wchar_t *__restrict dst,
 	const wchar_t *__restrict src,
 	size_t count)
 {
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index 483754997..b8623ba06 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -36,8 +36,7 @@ QUICKREF
 #include <wctype.h>
 
 int
-_DEFUN (wcscasecmp, (s1, s2),
-	const wchar_t *s1,
+wcscasecmp (const wchar_t *s1,
 	const wchar_t *s2)
 {
   int d = 0;
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 40b7774e5..c6bde4a6e 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -61,8 +61,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcscat, (s1, s2),
-	wchar_t *__restrict s1,
+wcscat (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2)
 {
   wchar_t *p;
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index f883f5443..62b96c344 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -58,8 +58,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcschr, (s, c),
-	const wchar_t * s,
+wcschr (const wchar_t * s,
 	wchar_t c)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index 1fb35755c..2784fac16 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -67,8 +67,7 @@ No supporting OS subroutines are required.
  * Compare strings.
  */
 int
-_DEFUN (wcscmp, (s1, s2),
-	const wchar_t * s1,
+wcscmp (const wchar_t * s1,
 	const wchar_t * s2)
 {
 
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 7d6b927f8..4bbf39c9a 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -33,8 +33,7 @@ PORTABILITY
 #include <wchar.h>
 
 int
-_DEFUN (wcscoll, (a, b),
-	const wchar_t *a,
+wcscoll (const wchar_t *a,
 	const wchar_t *b)
 
 {
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 679e9c543..802d2af1f 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -57,8 +57,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcscpy, (s1, s2),
-	wchar_t *__restrict s1,
+wcscpy (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2)
 {
   wchar_t *p;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 54bca2fa7..4feb6e7c9 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcscspn, (s, set),
-	const wchar_t * s,
+wcscspn (const wchar_t * s,
 	const wchar_t * set)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index dd96d3049..189a710bd 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -68,8 +68,7 @@ No supporting OS subroutines are required.
  * truncation occurred.
  */
 size_t
-_DEFUN (wcslcat, (dst, src, siz),
-	wchar_t * dst,
+wcslcat (wchar_t * dst,
 	const wchar_t * src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index a21f8c8fc..3d688a943 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
  * Returns wcslen(src); if retval >= siz, truncation occurred.
  */
 size_t
-_DEFUN (wcslcpy, (dst, src, siz),
-	wchar_t * dst,
+wcslcpy (wchar_t * dst,
 	const wchar_t * src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index c92757708..8fa9f723c 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -55,8 +55,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcslen, (s),
-	const wchar_t * s)
+wcslen (const wchar_t * s)
 {
   const wchar_t *p;
 
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index 7abb154ee..b77952ac3 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -37,8 +37,7 @@ QUICKREF
 #include <wctype.h>
 
 int 
-_DEFUN (wcsncasecmp, (s1, s2, n),
-	const wchar_t *s1,
+wcsncasecmp (const wchar_t *s1,
 	const wchar_t *s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 3c344b46e..4c14e19f3 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsncat, (s1, s2, n),
-	wchar_t *__restrict s1,
+wcsncat (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 2dc7660f4..aba4f54aa 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -63,8 +63,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 int
-_DEFUN (wcsncmp, (s1, s2, n),
-	const wchar_t * s1,
+wcsncmp (const wchar_t * s1,
 	const wchar_t * s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index 324dad3a2..9b103b1bd 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -35,8 +35,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsncpy, (s1, s2, n),
-	wchar_t *__restrict s1,
+wcsncpy (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index cc7d66e10..fff1a7ec2 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -52,8 +52,7 @@ PORTABILITY
 #include <wchar.h>
 
 size_t
-_DEFUN(wcsnlen, (s, maxlen), 
-                 const wchar_t *s,
+wcsnlen (const wchar_t *s,
                  size_t maxlen)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index ecda7affe..5a3d01ece 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -57,8 +57,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcspbrk, (s, set),
-	const wchar_t * s,
+wcspbrk (const wchar_t * s,
 	const wchar_t * set)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index f12ccc202..0e22dc024 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -60,8 +60,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsrchr, (s, c),
-	const wchar_t * s,
+wcsrchr (const wchar_t * s,
 	wchar_t c)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 196816821..db64f1f18 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcsspn, (s, set),
-	const wchar_t * s,
+wcsspn (const wchar_t * s,
 	const wchar_t * set)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index d5a031452..e77e50584 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -61,8 +61,7 @@ PORTABILITY
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsstr, (big, little),
-	const wchar_t *__restrict big,
+wcsstr (const wchar_t *__restrict big,
 	const wchar_t *__restrict little)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcstok.c b/newlib/libc/string/wcstok.c
index 2467704fd..f7d1c5ee9 100644
--- a/newlib/libc/string/wcstok.c
+++ b/newlib/libc/string/wcstok.c
@@ -90,8 +90,7 @@ QUICKREF
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcstok, (s, delim, lasts),
-	register wchar_t *__restrict s,
+wcstok (register wchar_t *__restrict s,
 	register const wchar_t *__restrict delim,
 	wchar_t **__restrict lasts)
 {
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 19abfd92d..4be7b8ae8 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -34,8 +34,7 @@ PORTABILITY
 #include "local.h"
 
 int
-_DEFUN (wcswidth, (pwcs, n),
-	const wchar_t *pwcs,
+wcswidth (const wchar_t *pwcs,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index 78d7da566..72b3c5bd0 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -36,8 +36,7 @@ PORTABILITY
 #include <wchar.h>
 
 size_t
-_DEFUN (wcsxfrm, (a, b, n),
-	wchar_t *__restrict a,
+wcsxfrm (wchar_t *__restrict a,
 	const wchar_t *__restrict b,
 	size_t n)
 
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index a8c73a542..fc40afd21 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -163,8 +163,7 @@ bisearch(wint_t ucs, const struct interval *table, int max)
  */
 
 int
-_DEFUN (__wcwidth, (ucs),
-	const wint_t ucs)
+__wcwidth (const wint_t ucs)
 {
 #ifdef _MB_CAPABLE
   /* sorted list of non-overlapping intervals of East Asian Ambiguous
@@ -329,8 +328,7 @@ _DEFUN (__wcwidth, (ucs),
 }
 
 int     
-_DEFUN (wcwidth, (wc),
-	const wchar_t wc)
+wcwidth (const wchar_t wc)
 { 
   wint_t wi = wc;
 
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 8db2f64cc..0353e5449 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -63,8 +63,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmemchr, (s, c, n),
-	const wchar_t * s,
+wmemchr (const wchar_t * s,
 	wchar_t c,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index abb9ed6ff..20223a33d 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 int
-_DEFUN (wmemcmp, (s1, s2, n),
-	const wchar_t * s1,
+wmemcmp (const wchar_t * s1,
 	const wchar_t * s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index ad1aa24bc..d763e2237 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -61,8 +61,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmemcpy, (d, s, n),
-	wchar_t *__restrict d,
+wmemcpy (wchar_t *__restrict d,
 	const wchar_t *__restrict s,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 22b5a987d..399fae4e9 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -66,8 +66,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmemmove, (d, s, n),
-	wchar_t * d,
+wmemmove (wchar_t * d,
 	const wchar_t * s,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index 7354e81da..98983f968 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -34,8 +34,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmempcpy, (d, s, n),
-	wchar_t *__restrict d,
+wmempcpy (wchar_t *__restrict d,
 	const wchar_t *__restrict s,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index f9ec361cd..2120b564b 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -59,8 +59,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t	*
-_DEFUN(wmemset, (s, c, n),
-	wchar_t *s,
+wmemset (wchar_t *s,
 	wchar_t c,
 	size_t n)
 {
diff --git a/newlib/libc/string/xpg_strerror_r.c b/newlib/libc/string/xpg_strerror_r.c
index bc1858738..66e693611 100644
--- a/newlib/libc/string/xpg_strerror_r.c
+++ b/newlib/libc/string/xpg_strerror_r.c
@@ -4,8 +4,7 @@
 #include <string.h>
 
 int
-_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
-	int errnum,
+__xpg_strerror_r (int errnum,
 	char *buffer,
 	size_t n)
 {
diff --git a/newlib/libc/sys/a29khif/kill.c b/newlib/libc/sys/a29khif/kill.c
index 0254367e4..ecb489e38 100644
--- a/newlib/libc/sys/a29khif/kill.c
+++ b/newlib/libc/sys/a29khif/kill.c
@@ -6,8 +6,7 @@
 /* The pid argument should be of type pid_t.  */
 
 int
-_DEFUN (_kill, (pid, sig),
-	int pid,
+_kill (int pid,
 	int sig)
 {
   if (pid == 1 || pid < 0)
diff --git a/newlib/libc/sys/h8300hms/misc.c b/newlib/libc/sys/h8300hms/misc.c
index 4869af2d3..159939391 100644
--- a/newlib/libc/sys/h8300hms/misc.c
+++ b/newlib/libc/sys/h8300hms/misc.c
@@ -7,19 +7,17 @@
 /* _raise(), getpid(), and kill() are required by abort().
    getpid/kill are prefixed with '_' because of MISSING_SYSCALL_NAMES.  */
 
-int _DEFUN(_raise,(sig),
-	   int sig)
+int _raise (int sig)
 {
   return 0;
 }
 
-int _DEFUN(_getpid,(),)
+int _getpid (void)
 {
   return 0;
 }
 
-int _DEFUN(_kill,(pid, sig),
-	   int pid,
+int _kill (int pid,
 	   int sig)
 {
   if (pid == 0)
diff --git a/newlib/libc/sys/h8500hms/misc.c b/newlib/libc/sys/h8500hms/misc.c
index d16c797d9..7f98ffceb 100644
--- a/newlib/libc/sys/h8500hms/misc.c
+++ b/newlib/libc/sys/h8500hms/misc.c
@@ -8,19 +8,17 @@
 /* _raise(), getpid(), and kill() are required by abort().
    getpid/kill are prefixed with '_' because of MISSING_SYSCALL_NAMES.  */
 
-int _DEFUN(_raise,(sig),
-	   int sig)
+int _raise (int sig)
 {
   return 0;
 }
 
-int _DEFUN(_getpid,(),)
+int _getpid (void)
 {
   return 0;
 }
 
-int _DEFUN(_kill,(pid, sig),
-	   int pid,
+int _kill (int pid,
 	   int sig)
 {
   if (sig == SIGABRT)
diff --git a/newlib/libc/sys/linux/ctermid.c b/newlib/libc/sys/linux/ctermid.c
index 05914ffad..bcf36f605 100644
--- a/newlib/libc/sys/linux/ctermid.c
+++ b/newlib/libc/sys/linux/ctermid.c
@@ -6,8 +6,7 @@
 static char devname[] = "/dev/tty";
 
 char *
-_DEFUN (ctermid, (buf),
-     char *buf)
+ctermid (char *buf)
 {
   if (buf == NULL)
     return devname;
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
index adf607e02..5a60cbc53 100644
--- a/newlib/libc/sys/linux/getpwent.c
+++ b/newlib/libc/sys/linux/getpwent.c
@@ -3,8 +3,7 @@
 #include <pwd.h>
 
 struct passwd *
-_DEFUN (getpwnam, (name),
-	const char *name)
+getpwnam (const char *name)
 {
   errno = ENOSYS;
   return NULL;
@@ -12,8 +11,7 @@ _DEFUN (getpwnam, (name),
 
 /* FIXME: dummy stub for now.  */
 struct passwd *
-_DEFUN (getpwuid, (uid),
-	uid_t uid)
+getpwuid (uid_t uid)
 {
   errno = ENOSYS;
   return NULL;
@@ -21,8 +19,7 @@ _DEFUN (getpwuid, (uid),
 
 /* FIXME: dummy stub for now.  */
 struct passwd *
-_DEFUN (getpwent, (uid),
-	uid_t uid)
+getpwent (uid_t uid)
 {
   errno = ENOSYS;
   return NULL;
diff --git a/newlib/libc/sys/linux/pread.c b/newlib/libc/sys/linux/pread.c
index 8d905598f..2ff30bd08 100644
--- a/newlib/libc/sys/linux/pread.c
+++ b/newlib/libc/sys/linux/pread.c
@@ -6,8 +6,7 @@
 #include <machine/weakalias.h>
 
 ssize_t
-_DEFUN (_pread_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr,
+_pread_r (struct _reent *rptr,
      int fd,
      void *buf,
      size_t n,
@@ -33,8 +32,7 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
 #ifndef _REENT_ONLY
 
 ssize_t
-_DEFUN (__libc_pread, (fd, buf, n, off),
-     int fd,
+__libc_pread (int fd,
      void *buf,
      size_t n,
      off_t off)
diff --git a/newlib/libc/sys/linux/pread64.c b/newlib/libc/sys/linux/pread64.c
index 20d1f9c35..bbf743eb5 100644
--- a/newlib/libc/sys/linux/pread64.c
+++ b/newlib/libc/sys/linux/pread64.c
@@ -30,8 +30,7 @@ Supporting OS subroutine required: <<read>>, <<lseek64>>.
 #include <machine/weakalias.h>
 
 ssize_t
-_DEFUN (__libc_pread64, (fd, buf, n, off),
-     int fd,
+__libc_pread64 (int fd,
      void *buf,
      size_t n,
      loff_t off)
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index b0ec9c233..341ca6f07 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -6,8 +6,7 @@
 #include <machine/weakalias.h>
 
 ssize_t
-_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr,
+_pwrite_r (struct _reent *rptr,
      int fd,
      const void *buf,
      size_t n,
@@ -33,8 +32,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
 #ifndef _REENT_ONLY
 
 ssize_t
-_DEFUN (__libc_pwrite, (fd, buf, n, off),
-     int fd,
+__libc_pwrite (int fd,
      const void *buf,
      size_t n,
      off_t off)
diff --git a/newlib/libc/sys/linux/pwrite64.c b/newlib/libc/sys/linux/pwrite64.c
index c80a3a2d3..864aa75fe 100644
--- a/newlib/libc/sys/linux/pwrite64.c
+++ b/newlib/libc/sys/linux/pwrite64.c
@@ -30,8 +30,7 @@ Supporting OS subroutine required: <<write>>, <<lseek64>>.
 #include <machine/weakalias.h>
 
 ssize_t
-_DEFUN (__libc_pwrite64, (fd, buf, n, off),
-     int fd,
+__libc_pwrite64 (int fd,
      void *buf,
      size_t n,
      loff_t off)
diff --git a/newlib/libc/sys/sparc64/ieee.c b/newlib/libc/sys/sparc64/ieee.c
index f3298e63d..42c530ba4 100644
--- a/newlib/libc/sys/sparc64/ieee.c
+++ b/newlib/libc/sys/sparc64/ieee.c
@@ -16,8 +16,7 @@ fpgetround (void)
 }
 
 fp_rnd
-_DEFUN(fpsetround,(new),
-       fp_rnd new)
+fpsetround (fp_rnd new)
 {
   fp_rnd old = fpgetround();
   char *dummy;
@@ -60,8 +59,7 @@ fpgetmask (void)
 }
 
 fp_except
-_DEFUN(fpsetmask,(mask),
-       fp_except mask)
+fpsetmask (fp_except mask)
 {
   fp_except old = fpgetmask();  
 
@@ -85,8 +83,7 @@ _DEFUN(fpsetmask,(mask),
 }
 
 fp_except 
-_DEFUN(fpsetsticky,(mask),
-       fp_except mask)
+fpsetsticky (fp_except mask)
 {
   return fpsetmask(mask);
 }
@@ -98,8 +95,7 @@ fpgetsticky (void)
 }
 
 int
-_DEFUN(fpsetroundtoi,(rdi_mode),
-       fp_rdi rdi_mode)
+fpsetroundtoi (fp_rdi rdi_mode)
 {
   
   return 0;
diff --git a/newlib/libc/sys/sun4/ieee.c b/newlib/libc/sys/sun4/ieee.c
index f3298e63d..42c530ba4 100644
--- a/newlib/libc/sys/sun4/ieee.c
+++ b/newlib/libc/sys/sun4/ieee.c
@@ -16,8 +16,7 @@ fpgetround (void)
 }
 
 fp_rnd
-_DEFUN(fpsetround,(new),
-       fp_rnd new)
+fpsetround (fp_rnd new)
 {
   fp_rnd old = fpgetround();
   char *dummy;
@@ -60,8 +59,7 @@ fpgetmask (void)
 }
 
 fp_except
-_DEFUN(fpsetmask,(mask),
-       fp_except mask)
+fpsetmask (fp_except mask)
 {
   fp_except old = fpgetmask();  
 
@@ -85,8 +83,7 @@ _DEFUN(fpsetmask,(mask),
 }
 
 fp_except 
-_DEFUN(fpsetsticky,(mask),
-       fp_except mask)
+fpsetsticky (fp_except mask)
 {
   return fpsetmask(mask);
 }
@@ -98,8 +95,7 @@ fpgetsticky (void)
 }
 
 int
-_DEFUN(fpsetroundtoi,(rdi_mode),
-       fp_rdi rdi_mode)
+fpsetroundtoi (fp_rdi rdi_mode)
 {
   
   return 0;
diff --git a/newlib/libc/sys/sysnec810/misc.c b/newlib/libc/sys/sysnec810/misc.c
index 354ecd81c..348e7195b 100644
--- a/newlib/libc/sys/sysnec810/misc.c
+++ b/newlib/libc/sys/sysnec810/misc.c
@@ -30,8 +30,7 @@ isatty() {
 }
 
 int
-_DEFUN(_fstat,(file, st),
-       int file,
+_fstat (int file,
        struct stat *st)
 {
   st->st_mode = S_IFCHR;
diff --git a/newlib/libc/sys/sysvi386/fpx.c b/newlib/libc/sys/sysvi386/fpx.c
index c9ff7c314..957a9b8d8 100644
--- a/newlib/libc/sys/sysvi386/fpx.c
+++ b/newlib/libc/sys/sysvi386/fpx.c
@@ -2,8 +2,7 @@
 #include <machine/registers.h>
 
 
-fp_except _DEFUN(fpsetmask,(newmask),
-		fp_except newmask)
+fp_except fpsetmask (fp_except newmask)
 
 {
   fp_except oldmask;
@@ -32,8 +31,7 @@ fp_rnd fpgetround (void)
   return tkcw.fp_rounding;
 }
 
-fp_rnd _DEFUN(fpsetround,(rnd),
-	     fp_rnd rnd)
+fp_rnd fpsetround (fp_rnd rnd)
 {
   fp_rnd oldrnd;
   v60_tkcw_type tkcw;
@@ -56,8 +54,7 @@ fp_rdi fpgetroundtoi (void)
   return tkcw.integer_rounding;
 }
 
-fp_rdi _DEFUN(fpsetroundtoi,(rnd),
-	     fp_rdi rnd)
+fp_rdi fpsetroundtoi (fp_rdi rnd)
 {
   fp_rdi oldrnd;
   v60_tkcw_type tkcw;
diff --git a/newlib/libc/sys/sysvnecv70/fpx.c b/newlib/libc/sys/sysvnecv70/fpx.c
index c9ff7c314..957a9b8d8 100644
--- a/newlib/libc/sys/sysvnecv70/fpx.c
+++ b/newlib/libc/sys/sysvnecv70/fpx.c
@@ -2,8 +2,7 @@
 #include <machine/registers.h>
 
 
-fp_except _DEFUN(fpsetmask,(newmask),
-		fp_except newmask)
+fp_except fpsetmask (fp_except newmask)
 
 {
   fp_except oldmask;
@@ -32,8 +31,7 @@ fp_rnd fpgetround (void)
   return tkcw.fp_rounding;
 }
 
-fp_rnd _DEFUN(fpsetround,(rnd),
-	     fp_rnd rnd)
+fp_rnd fpsetround (fp_rnd rnd)
 {
   fp_rnd oldrnd;
   v60_tkcw_type tkcw;
@@ -56,8 +54,7 @@ fp_rdi fpgetroundtoi (void)
   return tkcw.integer_rounding;
 }
 
-fp_rdi _DEFUN(fpsetroundtoi,(rnd),
-	     fp_rdi rnd)
+fp_rdi fpsetroundtoi (fp_rdi rnd)
 {
   fp_rdi oldrnd;
   v60_tkcw_type tkcw;
diff --git a/newlib/libc/syscalls/sysclose.c b/newlib/libc/syscalls/sysclose.c
index 946544bed..44ec36eb3 100644
--- a/newlib/libc/syscalls/sysclose.c
+++ b/newlib/libc/syscalls/sysclose.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (close, (fd),
-     int fd)
+close (int fd)
 {
   return _close_r (_REENT, fd);
 }
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index 1a593117d..52dbaddc3 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (execve, (name, argv, env),
-     const char *name,
+execve (const char *name,
      char *const argv[],
      char *const env[])
 {
diff --git a/newlib/libc/syscalls/sysfcntl.c b/newlib/libc/syscalls/sysfcntl.c
index b063d766f..feccbf072 100644
--- a/newlib/libc/syscalls/sysfcntl.c
+++ b/newlib/libc/syscalls/sysfcntl.c
@@ -5,8 +5,7 @@
 #include <errno.h>
 
 int
-_DEFUN (fcntl, (fd, flag, arg),
-     int fd,
+fcntl (int fd,
      int flag,
      int arg)
 {
diff --git a/newlib/libc/syscalls/sysfstat.c b/newlib/libc/syscalls/sysfstat.c
index 1ab7d62fa..c95e9aab1 100644
--- a/newlib/libc/syscalls/sysfstat.c
+++ b/newlib/libc/syscalls/sysfstat.c
@@ -5,8 +5,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (fstat, (fd, pstat),
-     int fd,
+fstat (int fd,
      struct stat *pstat)
 {
   return _fstat_r (_REENT, fd, pstat);
diff --git a/newlib/libc/syscalls/sysgettod.c b/newlib/libc/syscalls/sysgettod.c
index f52f0045f..e050d35e2 100644
--- a/newlib/libc/syscalls/sysgettod.c
+++ b/newlib/libc/syscalls/sysgettod.c
@@ -5,8 +5,7 @@
 #include <sys/time.h>
 
 int
-_DEFUN (gettimeofday, (ptimeval, ptimezone),
-     struct timeval *ptimeval,
+gettimeofday (struct timeval *ptimeval,
      void *ptimezone)
 {
   return _gettimeofday_r (_REENT, ptimeval, ptimezone);
diff --git a/newlib/libc/syscalls/sysisatty.c b/newlib/libc/syscalls/sysisatty.c
index 5a6b8d455..697c54bc4 100644
--- a/newlib/libc/syscalls/sysisatty.c
+++ b/newlib/libc/syscalls/sysisatty.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (isatty, (fd),
-     int fd)
+isatty (int fd)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _isatty_r (_REENT, fd);
diff --git a/newlib/libc/syscalls/syskill.c b/newlib/libc/syscalls/syskill.c
index 03e06c07a..34b9f17de 100644
--- a/newlib/libc/syscalls/syskill.c
+++ b/newlib/libc/syscalls/syskill.c
@@ -4,8 +4,7 @@
 #include <signal.h>
 
 int
-_DEFUN (kill, (pid, sig),
-     int pid,
+kill (int pid,
      int sig)
 {
   return _kill_r (_REENT, pid, sig);
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index 188040e4e..2f7dec6f9 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (link, (old, new),
-     const char *old,
+link (const char *old,
      const char *new)
 {
   return _link_r (_REENT, old, new);
diff --git a/newlib/libc/syscalls/syslseek.c b/newlib/libc/syscalls/syslseek.c
index 41cfbf745..4d5edd0f3 100644
--- a/newlib/libc/syscalls/syslseek.c
+++ b/newlib/libc/syscalls/syslseek.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 off_t
-_DEFUN (lseek, (fd, pos, whence),
-     int fd,
+lseek (int fd,
      off_t pos,
      int whence)
 {
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index 36523fc67..4d1a29953 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -10,8 +10,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN (open, (file, flags, ...),
-        const char *file,
+open (const char *file,
         int flags, ...)
 {
   va_list ap;
diff --git a/newlib/libc/syscalls/sysread.c b/newlib/libc/syscalls/sysread.c
index e45b76336..25d4e3bcf 100644
--- a/newlib/libc/syscalls/sysread.c
+++ b/newlib/libc/syscalls/sysread.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN (read, (fd, buf, cnt),
-     int fd,
+read (int fd,
      void *buf,
      size_t cnt)
 {
diff --git a/newlib/libc/syscalls/syssbrk.c b/newlib/libc/syscalls/syssbrk.c
index a3e550579..79b876321 100644
--- a/newlib/libc/syscalls/syssbrk.c
+++ b/newlib/libc/syscalls/syssbrk.c
@@ -7,8 +7,7 @@ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
 extern void *_sbrk (ptrdiff_t);
 
 void *
-_DEFUN (sbrk, (incr),
-     ptrdiff_t incr)
+sbrk (ptrdiff_t incr)
 {
   return _sbrk_r (_REENT, incr);
 }
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index 3e0287ec8..0490df164 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -5,8 +5,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (stat, (file, pstat),
-     const char *file,
+stat (const char *file,
      struct stat *pstat)
 {
   return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/systimes.c b/newlib/libc/syscalls/systimes.c
index cc30a3e38..ecd958348 100644
--- a/newlib/libc/syscalls/systimes.c
+++ b/newlib/libc/syscalls/systimes.c
@@ -4,8 +4,7 @@
 #include <sys/times.h>
 
 clock_t
-_DEFUN (times, (buf),
-     struct tms *buf)
+times (struct tms *buf)
 {
   return _times_r (_REENT, buf);
 }
diff --git a/newlib/libc/syscalls/sysunlink.c b/newlib/libc/syscalls/sysunlink.c
index 06b4fc086..ecd052e7d 100644
--- a/newlib/libc/syscalls/sysunlink.c
+++ b/newlib/libc/syscalls/sysunlink.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 int
-_DEFUN (unlink, (file),
-        const char *file)
+unlink (const char *file)
 {
   return _unlink_r (_REENT, file);
 }
diff --git a/newlib/libc/syscalls/syswait.c b/newlib/libc/syscalls/syswait.c
index 070160342..25b5c4788 100644
--- a/newlib/libc/syscalls/syswait.c
+++ b/newlib/libc/syscalls/syswait.c
@@ -4,8 +4,7 @@
 #include <sys/wait.h>
 
 pid_t
-_DEFUN (wait, (status),
-        int *status)
+wait (int *status)
 {
   return _wait_r (_REENT, status);
 }
diff --git a/newlib/libc/syscalls/syswrite.c b/newlib/libc/syscalls/syswrite.c
index 35a1e8430..3b9b878f5 100644
--- a/newlib/libc/syscalls/syswrite.c
+++ b/newlib/libc/syscalls/syswrite.c
@@ -4,8 +4,7 @@
 #include <unistd.h>
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN (write, (fd, buf, cnt),
-     int fd,
+write (int fd,
      const void *buf,
      size_t cnt)
 {
diff --git a/newlib/libc/time/asctime.c b/newlib/libc/time/asctime.c
index cbecd94f1..9aa26c3dc 100644
--- a/newlib/libc/time/asctime.c
+++ b/newlib/libc/time/asctime.c
@@ -48,8 +48,7 @@ ANSI C requires <<asctime>>.
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN (asctime, (tim_p),
-	const struct tm *tim_p)
+asctime (const struct tm *tim_p)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index 93e3fc27f..3e0864fc8 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -6,8 +6,7 @@
 #include <time.h>
 
 char *
-_DEFUN (asctime_r, (tim_p, result),
-	const struct tm *__restrict tim_p,
+asctime_r (const struct tm *__restrict tim_p,
 	char *__restrict result)
 {
   static const char day_name[7][3] = {
diff --git a/newlib/libc/time/ctime.c b/newlib/libc/time/ctime.c
index f0592f469..58826a6d8 100644
--- a/newlib/libc/time/ctime.c
+++ b/newlib/libc/time/ctime.c
@@ -37,8 +37,7 @@ ANSI C requires <<ctime>>.
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN (ctime, (tim_p),
-	const time_t * tim_p)
+ctime (const time_t * tim_p)
 {
   return asctime (localtime (tim_p));
 }
diff --git a/newlib/libc/time/ctime_r.c b/newlib/libc/time/ctime_r.c
index 4ab0ba77d..63aee3890 100644
--- a/newlib/libc/time/ctime_r.c
+++ b/newlib/libc/time/ctime_r.c
@@ -5,8 +5,7 @@
 #include <time.h>
 
 char *
-_DEFUN (ctime_r, (tim_p, result),
-	const time_t * tim_p,
+ctime_r (const time_t * tim_p,
         char * result)
 
 {
diff --git a/newlib/libc/time/difftime.c b/newlib/libc/time/difftime.c
index 363eb6482..52ab9d84f 100644
--- a/newlib/libc/time/difftime.c
+++ b/newlib/libc/time/difftime.c
@@ -30,8 +30,7 @@ in all implementations.
 #include <time.h>
 
 double
-_DEFUN (difftime, (tim1, tim2),
-	time_t tim1,
+difftime (time_t tim1,
 	time_t tim2)
 {
   return (double)(tim1 - tim2);
diff --git a/newlib/libc/time/gmtime.c b/newlib/libc/time/gmtime.c
index e74a16157..08e011129 100644
--- a/newlib/libc/time/gmtime.c
+++ b/newlib/libc/time/gmtime.c
@@ -50,8 +50,7 @@ ANSI C requires <<gmtime>>.
 #ifndef _REENT_ONLY
 
 struct tm *
-_DEFUN (gmtime, (tim_p),
-	const time_t * tim_p)
+gmtime (const time_t * tim_p)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index dcc5dd166..8bf9ee52d 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -46,8 +46,7 @@
 #define YEARS_PER_ERA		400
 
 struct tm *
-_DEFUN (gmtime_r, (tim_p, res),
-	const time_t *__restrict tim_p,
+gmtime_r (const time_t *__restrict tim_p,
 	struct tm *__restrict res)
 {
   long days, rem;
diff --git a/newlib/libc/time/lcltime.c b/newlib/libc/time/lcltime.c
index 493df80d1..ded98c57a 100644
--- a/newlib/libc/time/lcltime.c
+++ b/newlib/libc/time/lcltime.c
@@ -43,8 +43,7 @@ ANSI C requires <<localtime>>.
 #ifndef _REENT_ONLY
 
 struct tm *
-_DEFUN (localtime, (tim_p),
-	const time_t * tim_p)
+localtime (const time_t * tim_p)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index 3eba498c3..9b9126bcc 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -16,8 +16,7 @@
 #include "local.h"
 
 struct tm *
-_DEFUN (localtime_r, (tim_p, res),
-	const time_t *__restrict tim_p,
+localtime_r (const time_t *__restrict tim_p,
 	struct tm *__restrict res)
 {
   long offset;
diff --git a/newlib/libc/time/mktime.c b/newlib/libc/time/mktime.c
index 1f0d9ba27..9bcef3268 100644
--- a/newlib/libc/time/mktime.c
+++ b/newlib/libc/time/mktime.c
@@ -62,8 +62,7 @@ static const int _DAYS_BEFORE_MONTH[12] =
 #define _DAYS_IN_YEAR(year) (_ISLEAP(year) ? 366 : 365)
 
 static void 
-_DEFUN(validate_structure, (tim_p),
-     struct tm *tim_p)
+validate_structure (struct tm *tim_p)
 {
   div_t res;
   int days_in_feb = 28;
@@ -149,8 +148,7 @@ _DEFUN(validate_structure, (tim_p),
 }
 
 time_t 
-_DEFUN(mktime, (tim_p),
-     struct tm *tim_p)
+mktime (struct tm *tim_p)
 {
   time_t tim = 0;
   long days = 0;
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index 4ed84fb23..3e5e268bc 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -348,8 +348,7 @@ static const int dname_len[7] =
    -1, 0, or 1 as the adjustment to add to the year for the ISO week
    numbering used in "%g%G%V", avoiding overflow.  */
 static int
-_DEFUN (iso_year_adjust, (tim_p),
-	const struct tm *tim_p)
+iso_year_adjust (const struct tm *tim_p)
 {
   /* Account for fact that tm_year==0 is year 1900.  */
   int leap = isleap (tim_p->tm_year + (YEAR_BASE
@@ -1431,8 +1430,7 @@ recurse:
 }
 
 size_t
-_DEFUN (strftime, (s, maxsize, format, tim_p),
-	CHAR *__restrict s,
+strftime (CHAR *__restrict s,
 	size_t maxsize,
 	const CHAR *__restrict format,
 	const struct tm *__restrict tim_p)
diff --git a/newlib/libc/time/time.c b/newlib/libc/time/time.c
index e0c3a8e74..93e061b83 100644
--- a/newlib/libc/time/time.c
+++ b/newlib/libc/time/time.c
@@ -33,8 +33,7 @@ Supporting OS subroutine required: Some implementations require
 #include <sys/time.h>
 
 time_t
-_DEFUN (time, (t),
-	time_t * t)
+time (time_t * t)
 {
   struct timeval now;
 
diff --git a/newlib/libc/time/tzcalc_limits.c b/newlib/libc/time/tzcalc_limits.c
index fe785058d..e0ea6549c 100644
--- a/newlib/libc/time/tzcalc_limits.c
+++ b/newlib/libc/time/tzcalc_limits.c
@@ -11,8 +11,7 @@
 #include "local.h"
 
 int
-_DEFUN (__tzcalc_limits, (year),
-	int year)
+__tzcalc_limits (int year)
 {
   int days, year_days, years;
   int i, j;
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 211ddc8af..9e0cf834b 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -14,8 +14,7 @@ static char __tzname_dst[11];
 static char *prev_tzenv = NULL;
 
 void
-_DEFUN (_tzset_unlocked_r, (reent_ptr),
-        struct _reent *reent_ptr)
+_tzset_unlocked_r (struct _reent *reent_ptr)
 {
   char *tzenv;
   unsigned short hh, mm, ss, m, w, d;
@@ -184,8 +183,7 @@ _DEFUN (_tzset_unlocked_r, (reent_ptr),
 }
 
 void
-_DEFUN (_tzset_r, (reent_ptr),
-        struct _reent *reent_ptr)
+_tzset_r (struct _reent *reent_ptr)
 {
   TZ_LOCK;
   _tzset_unlocked_r (reent_ptr);
diff --git a/newlib/libc/unix/basename.c b/newlib/libc/unix/basename.c
index 3a9cc0c19..7a28ac51b 100644
--- a/newlib/libc/unix/basename.c
+++ b/newlib/libc/unix/basename.c
@@ -8,8 +8,7 @@
 #include <string.h>
 
 char* 
-_DEFUN (basename, (path),
-	char *path)
+basename (char *path)
 {
 	char *p;
 	if( path == NULL || *path == '\0' )
diff --git a/newlib/libc/unix/dirname.c b/newlib/libc/unix/dirname.c
index 164da7f78..7d8d6f024 100644
--- a/newlib/libc/unix/dirname.c
+++ b/newlib/libc/unix/dirname.c
@@ -9,8 +9,7 @@
 #include <string.h>
 
 char *
-_DEFUN (dirname, (path),
-	char *path)
+dirname (char *path)
 {
 	char *p;
 	if( path == NULL || *path == '\0' )
diff --git a/newlib/libc/unix/pread.c b/newlib/libc/unix/pread.c
index 54efe29fe..61daac3b4 100644
--- a/newlib/libc/unix/pread.c
+++ b/newlib/libc/unix/pread.c
@@ -38,8 +38,7 @@ Supporting OS subroutine required: <<read>>, <<lseek>>.
 #include <reent.h>
 
 ssize_t
-_DEFUN (_pread_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr,
+_pread_r (struct _reent *rptr,
      int fd,
      void *buf,
      size_t n,
@@ -65,8 +64,7 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
 #ifndef _REENT_ONLY
 
 ssize_t
-_DEFUN (pread, (fd, buf, n, off),
-     int fd,
+pread (int fd,
      void *buf,
      size_t n,
      off_t off)
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index 939d186d4..60166c9f9 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -39,8 +39,7 @@ Supporting OS subroutine required: <<write>>, <<lseek>>.
 #include <reent.h>
 
 ssize_t
-_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr,
+_pwrite_r (struct _reent *rptr,
      int fd,
      const void *buf,
      size_t n,
@@ -66,8 +65,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
 #ifndef _REENT_ONLY
 
 ssize_t
-_DEFUN (pwrite, (fd, buf, n, off),
-     int fd,
+pwrite (int fd,
      const void *buf,
      size_t n,
      off_t off)
diff --git a/newlib/libc/unix/ttyname.c b/newlib/libc/unix/ttyname.c
index b36bb7408..a9a4a5bb4 100644
--- a/newlib/libc/unix/ttyname.c
+++ b/newlib/libc/unix/ttyname.c
@@ -41,8 +41,7 @@ static char ttyname_buf[TTYNAME_BUFSIZE] = _PATH_DEV;
  *  ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
  */
 char *
-_DEFUN( ttyname,(fd),
-	int fd)
+ ttyname (int fd)
 {
   register int  fail;
   register char *ret=NULL;
diff --git a/newlib/libc/unix/ttyname_r.c b/newlib/libc/unix/ttyname_r.c
index 673e7f543..fd3b504a7 100644
--- a/newlib/libc/unix/ttyname_r.c
+++ b/newlib/libc/unix/ttyname_r.c
@@ -44,8 +44,7 @@
  *  ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
  */
 int
-_DEFUN( ttyname_r,(fd, name, namesize),
-	int fd,
+ ttyname_r (int fd,
 	char   *name,
 	size_t  namesize)
 {
diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index b60a89782..075093014 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -62,8 +62,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
  * Not a filter, but a convenient utility nonetheless
  */
 void
-_DEFUN (xdr_free, (proc, objp),
-        xdrproc_t proc,
+xdr_free (xdrproc_t proc,
 	void * objp)
 {
   XDR x;
@@ -86,8 +85,7 @@ xdr_void (void)
  * XDR integers
  */
 bool_t
-_DEFUN (xdr_int, (xdrs, ip),
-        XDR * xdrs,
+xdr_int (XDR * xdrs,
 	int * ip)
 {
 #if INT_MAX < LONG_MAX
@@ -121,8 +119,7 @@ _DEFUN (xdr_int, (xdrs, ip),
  * XDR unsigned integers
  */
 bool_t
-_DEFUN (xdr_u_int, (xdrs, up),
-        XDR * xdrs,
+xdr_u_int (XDR * xdrs,
 	u_int * up)
 {
 #if UINT_MAX < ULONG_MAX
@@ -156,8 +153,7 @@ _DEFUN (xdr_u_int, (xdrs, up),
  * XDR long integers
  */
 bool_t
-_DEFUN (xdr_long, (xdrs, lp),
-        XDR * xdrs,
+xdr_long (XDR * xdrs,
 	long * lp)
 {
   if ((xdrs->x_op == XDR_ENCODE)
@@ -177,8 +173,7 @@ _DEFUN (xdr_long, (xdrs, lp),
  * XDR unsigned long integers
  */
 bool_t
-_DEFUN (xdr_u_long, (xdrs, ulp),
-        XDR * xdrs,
+xdr_u_long (XDR * xdrs,
 	u_long * ulp)
 {
   switch (xdrs->x_op)
@@ -208,8 +203,7 @@ _DEFUN (xdr_u_long, (xdrs, ulp),
  * XDR 32-bit integers
  */
 bool_t
-_DEFUN (xdr_int32_t, (xdrs, int32_p),
-        XDR * xdrs,
+xdr_int32_t (XDR * xdrs,
 	int32_t * int32_p)
 {
   switch (xdrs->x_op)
@@ -230,8 +224,7 @@ _DEFUN (xdr_int32_t, (xdrs, int32_p),
  * XDR unsigned 32-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
-        XDR * xdrs,
+xdr_u_int32_t (XDR * xdrs,
 	u_int32_t * u_int32_p)
 {
   switch (xdrs->x_op)
@@ -252,8 +245,7 @@ _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
  * XDR unsigned 32-bit integers
  */
 bool_t
-_DEFUN (xdr_uint32_t, (xdrs, uint32_p),
-        XDR * xdrs,
+xdr_uint32_t (XDR * xdrs,
 	uint32_t * uint32_p)
 {
   switch (xdrs->x_op)
@@ -274,8 +266,7 @@ _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
  * XDR short integers
  */
 bool_t
-_DEFUN (xdr_short, (xdrs, sp),
-        XDR * xdrs,
+xdr_short (XDR * xdrs,
 	short * sp)
 {
   long l;
@@ -302,8 +293,7 @@ _DEFUN (xdr_short, (xdrs, sp),
  * XDR unsigned short integers
  */
 bool_t
-_DEFUN (xdr_u_short, (xdrs, usp),
-        XDR * xdrs,
+xdr_u_short (XDR * xdrs,
 	u_short * usp)
 {
   long l;
@@ -331,8 +321,7 @@ _DEFUN (xdr_u_short, (xdrs, usp),
  * XDR 16-bit integers
  */
 bool_t
-_DEFUN (xdr_int16_t, (xdrs, int16_p),
-        XDR * xdrs,
+xdr_int16_t (XDR * xdrs,
 	int16_t * int16_p)
 {
   int32_t t;
@@ -359,8 +348,7 @@ _DEFUN (xdr_int16_t, (xdrs, int16_p),
  * XDR unsigned 16-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
-        XDR * xdrs,
+xdr_u_int16_t (XDR * xdrs,
 	u_int16_t * u_int16_p)
 {
   uint32_t ut;
@@ -387,8 +375,7 @@ _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
  * XDR unsigned 16-bit integers
  */
 bool_t
-_DEFUN (xdr_uint16_t, (xdrs, uint16_p),
-        XDR * xdrs,
+xdr_uint16_t (XDR * xdrs,
 	uint16_t * uint16_p)
 {
   uint32_t ut;
@@ -415,8 +402,7 @@ _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
  * XDR 8-bit integers
  */
 bool_t
-_DEFUN (xdr_int8_t, (xdrs, int8_p),
-        XDR * xdrs,
+xdr_int8_t (XDR * xdrs,
 	int8_t * int8_p)
 {
   int32_t t;
@@ -443,8 +429,7 @@ _DEFUN (xdr_int8_t, (xdrs, int8_p),
  * XDR unsigned 8-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
-        XDR * xdrs,
+xdr_u_int8_t (XDR * xdrs,
 	u_int8_t * u_int8_p)
 {
   uint32_t ut;
@@ -471,8 +456,7 @@ _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
  * XDR unsigned 8-bit integers
  */
 bool_t
-_DEFUN (xdr_uint8_t, (xdrs, uint8_p),
-        XDR * xdrs,
+xdr_uint8_t (XDR * xdrs,
 	uint8_t * uint8_p)
 {
   uint32_t ut;
@@ -501,8 +485,7 @@ _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
  * XDR a char
  */
 bool_t
-_DEFUN (xdr_char, (xdrs, cp),
-        XDR * xdrs,
+xdr_char (XDR * xdrs,
 	char * cp)
 {
   int i;
@@ -518,8 +501,7 @@ _DEFUN (xdr_char, (xdrs, cp),
  * XDR an unsigned char
  */
 bool_t
-_DEFUN (xdr_u_char, (xdrs, ucp),
-        XDR * xdrs,
+xdr_u_char (XDR * xdrs,
 	u_char * ucp)
 {
   u_int u;
@@ -535,8 +517,7 @@ _DEFUN (xdr_u_char, (xdrs, ucp),
  * XDR booleans
  */
 bool_t
-_DEFUN (xdr_bool, (xdrs, bp),
-        XDR * xdrs,
+xdr_bool (XDR * xdrs,
 	bool_t * bp)
 {
   long lb;
@@ -563,8 +544,7 @@ _DEFUN (xdr_bool, (xdrs, bp),
  * XDR enumerations
  */
 bool_t
-_DEFUN (xdr_enum, (xdrs, ep),
-        XDR * xdrs,
+xdr_enum (XDR * xdrs,
 	enum_t * ep)
 {
   enum sizecheck
@@ -607,8 +587,7 @@ _DEFUN (xdr_enum, (xdrs, ep),
  * cp points to the opaque object and cnt gives the byte length.
  */
 bool_t
-_DEFUN (xdr_opaque, (xdrs, cp, cnt),
-        XDR * xdrs,
+xdr_opaque (XDR * xdrs,
 	caddr_t cp,
 	u_int cnt)
 {
@@ -656,8 +635,7 @@ _DEFUN (xdr_opaque, (xdrs, cp, cnt),
  * If *cpp is NULL maxsize bytes are allocated
  */
 bool_t
-_DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
-        XDR * xdrs,
+xdr_bytes (XDR * xdrs,
 	char ** cpp,
 	u_int * sizep,
 	u_int maxsize)
@@ -711,8 +689,7 @@ _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
  * Implemented here due to commonality of the object.
  */
 bool_t
-_DEFUN (xdr_netobj, (xdrs, np),
-        XDR * xdrs,
+xdr_netobj (XDR * xdrs,
 	struct netobj * np)
 {
   return (xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -734,8 +711,7 @@ _DEFUN (xdr_netobj, (xdrs, np),
  *   dfault:   default xdr routine
  */
 bool_t
-_DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
-        XDR * xdrs,
+xdr_union (XDR * xdrs,
         enum_t * dscmp,
         char * unp,
         const struct xdr_discrim * choices,
@@ -783,8 +759,7 @@ _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
  * of the string as specified by a protocol.
  */
 bool_t
-_DEFUN (xdr_string, (xdrs, cpp, maxsize),
-        XDR * xdrs,
+xdr_string (XDR * xdrs,
         char ** cpp,
         u_int maxsize)
 {
@@ -861,8 +836,7 @@ _DEFUN (xdr_string, (xdrs, cpp, maxsize),
  * routines like clnt_call
  */
 bool_t
-_DEFUN (xdr_wrapstring, (xdrs, cpp),
-        XDR * xdrs,
+xdr_wrapstring (XDR * xdrs,
         char ** cpp)
 {
   return xdr_string (xdrs, cpp, LASTUNSIGNED);
@@ -882,8 +856,7 @@ _DEFUN (xdr_wrapstring, (xdrs, cpp),
  * XDR 64-bit integers
  */
 bool_t
-_DEFUN (xdr_int64_t, (xdrs, llp),
-        XDR * xdrs,
+xdr_int64_t (XDR * xdrs,
         int64_t * llp)
 {
   int32_t t1, t2;
@@ -913,8 +886,7 @@ _DEFUN (xdr_int64_t, (xdrs, llp),
  * XDR unsigned 64-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int64_t, (xdrs, ullp),
-        XDR * xdrs,
+xdr_u_int64_t (XDR * xdrs,
         u_int64_t * ullp)
 {
   uint32_t t1, t2;
@@ -945,8 +917,7 @@ _DEFUN (xdr_u_int64_t, (xdrs, ullp),
  * XDR unsigned 64-bit integers
  */
 bool_t
-_DEFUN (xdr_uint64_t, (xdrs, ullp),
-        XDR * xdrs,
+xdr_uint64_t (XDR * xdrs,
         uint64_t * ullp)
 {
   uint32_t t1, t2;
@@ -978,8 +949,7 @@ _DEFUN (xdr_uint64_t, (xdrs, ullp),
  * XDR hypers
  */
 bool_t
-_DEFUN (xdr_hyper, (xdrs, llp),
-        XDR * xdrs,
+xdr_hyper (XDR * xdrs,
         quad_t * llp)
 {
   /*
@@ -994,8 +964,7 @@ _DEFUN (xdr_hyper, (xdrs, llp),
  * XDR unsigned hypers
  */
 bool_t
-_DEFUN (xdr_u_hyper, (xdrs, ullp),
-        XDR * xdrs,
+xdr_u_hyper (XDR * xdrs,
         u_quad_t * ullp)
 {
   /*
@@ -1010,8 +979,7 @@ _DEFUN (xdr_u_hyper, (xdrs, ullp),
  * XDR longlong_t's
  */
 bool_t
-_DEFUN (xdr_longlong_t, (xdrs, llp),
-        XDR * xdrs,
+xdr_longlong_t (XDR * xdrs,
         quad_t * llp)
 {
   /*
@@ -1026,8 +994,7 @@ _DEFUN (xdr_longlong_t, (xdrs, llp),
  * XDR u_longlong_t's
  */
 bool_t
-_DEFUN (xdr_u_longlong_t, (xdrs, ullp),
-        XDR * xdrs,
+xdr_u_longlong_t (XDR * xdrs,
         u_quad_t *ullp)
 {
   /*
diff --git a/newlib/libc/xdr/xdr_array.c b/newlib/libc/xdr/xdr_array.c
index 9c9748725..77e7164d2 100644
--- a/newlib/libc/xdr/xdr_array.c
+++ b/newlib/libc/xdr/xdr_array.c
@@ -54,8 +54,7 @@
  * xdr procedure to call to handle each element of the array.
  */
 bool_t
-_DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
-        XDR * xdrs,
+xdr_array (XDR * xdrs,
 	caddr_t * addrp,
 	u_int * sizep,
 	u_int maxsize,
@@ -138,8 +137,7 @@ _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
  * > xdr_elem: routine to XDR each element
  */
 bool_t
-_DEFUN (xdr_vector, (xdrs, basep, nelem, elemsize, xdr_elem),
-        XDR * xdrs,
+xdr_vector (XDR * xdrs,
 	char *basep,
 	u_int nelem,
 	u_int elemsize,
diff --git a/newlib/libc/xdr/xdr_float.c b/newlib/libc/xdr/xdr_float.c
index 691e92965..e19b1ef9e 100644
--- a/newlib/libc/xdr/xdr_float.c
+++ b/newlib/libc/xdr/xdr_float.c
@@ -59,8 +59,7 @@
 #if defined(__IEEE_LITTLE_ENDIAN) || defined(__IEEE_BIG_ENDIAN)
 
 bool_t
-_DEFUN (xdr_float, (xdrs, fp),
-       XDR * xdrs,
+xdr_float (XDR * xdrs,
        float *fp)
 {
   switch (xdrs->x_op)
@@ -80,8 +79,7 @@ _DEFUN (xdr_float, (xdrs, fp),
 
 #if !defined(_DOUBLE_IS_32BITS)
 bool_t
-_DEFUN (xdr_double, (xdrs, dp),
-        XDR * xdrs,
+xdr_double (XDR * xdrs,
 	double *dp)
 {
   int32_t *i32p;
diff --git a/newlib/libc/xdr/xdr_float_vax.c b/newlib/libc/xdr/xdr_float_vax.c
index ed943480f..09c24b03e 100644
--- a/newlib/libc/xdr/xdr_float_vax.c
+++ b/newlib/libc/xdr/xdr_float_vax.c
@@ -81,8 +81,7 @@ static struct sgl_limits
 */
 
 bool_t
-_DEFUN (xdr_float, (xdrs, fp),
-       XDR * xdrs,
+xdr_float (XDR * xdrs,
        float *fp)
 {
   struct ieee_single is;
@@ -184,8 +183,7 @@ static struct dbl_limits
 */
 
 bool_t
-_DEFUN (xdr_double, (xdrs, dp),
-        XDR * xdrs,
+xdr_double (XDR * xdrs,
 	double *dp)
 {
   int32_t *lp;
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 16d128774..3187ade74 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -101,8 +101,7 @@ static const struct xdr_ops xdrmem_ops_unaligned = {
  * memory buffer.
  */
 void
-_DEFUN (xdrmem_create, (xdrs, addr, size, op),
-        XDR * xdrs,
+xdrmem_create (XDR * xdrs,
 	caddr_t addr,
 	u_int size,
 	enum xdr_op op)
@@ -116,14 +115,12 @@ _DEFUN (xdrmem_create, (xdrs, addr, size, op),
 }
 
 static void
-_DEFUN (xdrmem_destroy, (xdrs),
-       XDR * xdrs)
+xdrmem_destroy (XDR * xdrs)
 {
 }
 
 static bool_t
-_DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_getlong_aligned (XDR * xdrs,
 	long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
@@ -135,8 +132,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_putlong_aligned (XDR * xdrs,
 	const long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
@@ -148,8 +144,7 @@ _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_getlong_unaligned (XDR * xdrs,
 	long *lp)
 {
   u_int32_t l;
@@ -164,8 +159,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_putlong_unaligned (XDR * xdrs,
 	const long *lp)
 {
   u_int32_t l;
@@ -180,8 +174,7 @@ _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_getbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrmem_getbytes (XDR * xdrs,
 	char *addr,
 	u_int len)
 {
@@ -194,8 +187,7 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
 }
 
 static bool_t
-_DEFUN (xdrmem_putbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrmem_putbytes (XDR * xdrs,
 	const char *addr,
 	u_int len)
 {
@@ -208,16 +200,14 @@ _DEFUN (xdrmem_putbytes, (xdrs, addr, len),
 }
 
 static u_int
-_DEFUN (xdrmem_getpos, (xdrs),
-        XDR * xdrs)
+xdrmem_getpos (XDR * xdrs)
 {
   /* XXX w/64-bit pointers, u_int not enough! */
   return (u_int) ((u_long) xdrs->x_private - (u_long) xdrs->x_base);
 }
 
 static bool_t
-_DEFUN (xdrmem_setpos, (xdrs, pos),
-        XDR * xdrs,
+xdrmem_setpos (XDR * xdrs,
 	u_int pos)
 {
   caddr_t newaddr = xdrs->x_base + pos;
@@ -236,8 +226,7 @@ _DEFUN (xdrmem_setpos, (xdrs, pos),
 }
 
 static int32_t *
-_DEFUN (xdrmem_inline_aligned, (xdrs, len),
-        XDR * xdrs,
+xdrmem_inline_aligned (XDR * xdrs,
 	u_int len)
 {
   int32_t *buf = 0;
@@ -252,16 +241,14 @@ _DEFUN (xdrmem_inline_aligned, (xdrs, len),
 }
 
 static int32_t *
-_DEFUN (xdrmem_inline_unaligned, (xdrs, len),
-        XDR * xdrs,
+xdrmem_inline_unaligned (XDR * xdrs,
 	u_int len)
 {
   return (0);
 }
 
 static bool_t
-_DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
-	XDR *xdrs,
+xdrmem_getint32_aligned (XDR *xdrs,
 	int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
@@ -273,8 +260,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
-        XDR *xdrs,
+xdrmem_putint32_aligned (XDR *xdrs,
 	const int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
@@ -286,8 +272,7 @@ _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
-	XDR *xdrs,
+xdrmem_getint32_unaligned (XDR *xdrs,
 	int32_t *ip)
 {
   u_int32_t l;
@@ -302,8 +287,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
-        XDR *xdrs,
+xdrmem_putint32_unaligned (XDR *xdrs,
 	const int32_t *ip)
 {
   u_int32_t l;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index 64eac9d23..cad6b7e82 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -26,8 +26,7 @@
 static xdr_vprintf_t xdr_vprintf = NULL;
 
 xdr_vprintf_t
-_DEFUN (xdr_set_vprintf, (fnptr),
-        xdr_vprintf_t fnptr)
+xdr_set_vprintf (xdr_vprintf_t fnptr)
 {
   xdr_vprintf_t tmp = xdr_vprintf;
   xdr_vprintf = fnptr;
@@ -35,8 +34,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
 }
 
 void
-_DEFUN (xdr_vwarnx, (format, ap),
-        const char *format,
+xdr_vwarnx (const char *format,
 	va_list ap)
 {
   if (xdr_vprintf)
@@ -48,8 +46,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
 }
 
 void
-_DEFUN (xdr_warnx, (fmt),
-        const char *fmt, ...)
+xdr_warnx (const char *fmt, ...)
 {
   va_list ap;
   va_start (ap, fmt);
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 367c3cb64..f46a9a3fa 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -169,8 +169,7 @@ bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
  * calls except that they take an opaque handle rather than an fd.
  */
 void
-_DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
-        XDR * xdrs,
+xdrrec_create (XDR * xdrs,
 	u_int sendsize,
 	u_int recvsize,
 	void *tcp_handle,
@@ -261,8 +260,7 @@ _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
  */
 
 static bool_t
-_DEFUN (xdrrec_getlong, (xdrs, lp),
-        XDR * xdrs,
+xdrrec_getlong (XDR * xdrs,
 	long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -288,8 +286,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrrec_putlong, (xdrs, lp),
-        XDR * xdrs,
+xdrrec_putlong (XDR * xdrs,
 	const long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -313,8 +310,7 @@ _DEFUN (xdrrec_putlong, (xdrs, lp),
 }
 
 static bool_t                   /* must manage buffers, fragments, and records */
-_DEFUN (xdrrec_getbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrrec_getbytes (XDR * xdrs,
 	char *addr,
 	u_int len)
 {
@@ -343,8 +339,7 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
 }
 
 static bool_t
-_DEFUN (xdrrec_putbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrrec_putbytes (XDR * xdrs,
         const char *addr,
 	u_int len)
 {
@@ -371,8 +366,7 @@ _DEFUN (xdrrec_putbytes, (xdrs, addr, len),
 }
 
 static u_int
-_DEFUN (xdrrec_getpos, (xdrs),
-        XDR * xdrs)
+xdrrec_getpos (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
   off_t pos;
@@ -398,8 +392,7 @@ _DEFUN (xdrrec_getpos, (xdrs),
 }
 
 static bool_t
-_DEFUN (xdrrec_setpos, (xdrs, pos),
-        XDR * xdrs,
+xdrrec_setpos (XDR * xdrs,
 	u_int pos)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -439,8 +432,7 @@ _DEFUN (xdrrec_setpos, (xdrs, pos),
 }
 
 static int32_t *
-_DEFUN (xdrrec_inline, (xdrs, len),
-        XDR * xdrs,
+xdrrec_inline (XDR * xdrs,
 	u_int len)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -482,8 +474,7 @@ _DEFUN (xdrrec_inline, (xdrs, len),
 }
 
 static void
-_DEFUN (xdrrec_destroy, (xdrs),
-        XDR * xdrs)
+xdrrec_destroy (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
 
@@ -493,8 +484,7 @@ _DEFUN (xdrrec_destroy, (xdrs),
 }
 
 static bool_t
-_DEFUN (xdrrec_getint32, (xdrs, ip),
-        XDR *xdrs,
+xdrrec_getint32 (XDR *xdrs,
 	int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -520,8 +510,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrrec_putint32, (xdrs, ip),
-        XDR *xdrs,
+xdrrec_putint32 (XDR *xdrs,
 	const int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -553,8 +542,7 @@ _DEFUN (xdrrec_putint32, (xdrs, ip),
  * this procedure to guarantee proper record alignment.
  */
 bool_t
-_DEFUN (xdrrec_skiprecord, (xdrs),
-        XDR * xdrs)
+xdrrec_skiprecord (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
   enum xprt_stat xstat;
@@ -592,8 +580,7 @@ _DEFUN (xdrrec_skiprecord, (xdrs),
  * after consuming the rest of the current record.
  */
 bool_t
-_DEFUN (xdrrec_eof, (xdrs),
-        XDR * xdrs)
+xdrrec_eof (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
 
@@ -617,8 +604,7 @@ _DEFUN (xdrrec_eof, (xdrs),
  * pipelined procedure calls.)  TRUE => immmediate flush to tcp connection.
  */
 bool_t
-_DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
-        XDR * xdrs,
+xdrrec_endofrecord (XDR * xdrs,
 	bool_t sendnow)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -644,8 +630,7 @@ _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
  * Return true if a record is available in the buffer, false if not.
  */
 bool_t
-_DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
-        XDR * xdrs,
+__xdrrec_getrec (XDR * xdrs,
 	enum xprt_stat * statp,
 	bool_t expectdata)
 {
@@ -737,8 +722,7 @@ _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
 }
 
 bool_t
-_DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
-        XDR * xdrs,
+__xdrrec_setnonblock (XDR * xdrs,
 	int maxrec)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -754,8 +738,7 @@ _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
  * Internal useful routines
  */
 static bool_t
-_DEFUN (flush_out, (rstrm, eor),
-        RECSTREAM * rstrm,
+flush_out (RECSTREAM * rstrm,
 	bool_t eor)
 {
   u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
@@ -775,8 +758,7 @@ _DEFUN (flush_out, (rstrm, eor),
 }
 
 static bool_t                   /* knows nothing about records!  Only about input buffers */
-_DEFUN (fill_input_buf, (rstrm),
-        RECSTREAM * rstrm)
+fill_input_buf (RECSTREAM * rstrm)
 {
   char *where;
   u_int32_t i;
@@ -798,8 +780,7 @@ _DEFUN (fill_input_buf, (rstrm),
 }
 
 static bool_t                   /* knows nothing about records!  Only about input buffers */
-_DEFUN (get_input_bytes, (rstrm, addr, len),
-        RECSTREAM * rstrm,
+get_input_bytes (RECSTREAM * rstrm,
 	char *addr,
 	size_t len)
 {
@@ -834,8 +815,7 @@ _DEFUN (get_input_bytes, (rstrm, addr, len),
 }
 
 static bool_t                   /* next two bytes of the input stream are treated as a header */
-_DEFUN (set_input_fragment, (rstrm),
-        RECSTREAM * rstrm)
+set_input_fragment (RECSTREAM * rstrm)
 {
   u_int32_t header;
 
@@ -860,8 +840,7 @@ _DEFUN (set_input_fragment, (rstrm),
 }
 
 static bool_t                   /* consumes input bytes; knows nothing about records! */
-_DEFUN (skip_input_bytes, (rstrm, cnt),
-        RECSTREAM * rstrm,
+skip_input_bytes (RECSTREAM * rstrm,
 	long cnt)
 {
   size_t current;
@@ -884,8 +863,7 @@ _DEFUN (skip_input_bytes, (rstrm, cnt),
 }
 
 static u_int
-_DEFUN (fix_buf_size, (s),
-        u_int s)
+fix_buf_size (u_int s)
 {
 
   if (s < 100)
@@ -897,8 +875,7 @@ _DEFUN (fix_buf_size, (s),
  * Reallocate the input buffer for a non-block stream.
  */
 static bool_t
-_DEFUN (realloc_stream, (rstrm, size),
-        RECSTREAM * rstrm,
+realloc_stream (RECSTREAM * rstrm,
 	int size)
 {
   ptrdiff_t diff;
diff --git a/newlib/libc/xdr/xdr_reference.c b/newlib/libc/xdr/xdr_reference.c
index 7a5f1d851..eba4b8355 100644
--- a/newlib/libc/xdr/xdr_reference.c
+++ b/newlib/libc/xdr/xdr_reference.c
@@ -56,8 +56,7 @@
  * proc is the routine to handle the referenced structure.
  */
 bool_t
-_DEFUN (xdr_reference, (xdrs, pp, size, proc),
-        XDR * xdrs,
+xdr_reference (XDR * xdrs,
 	caddr_t * pp,
 	u_int size,
 	xdrproc_t proc)
@@ -117,8 +116,7 @@ _DEFUN (xdr_reference, (xdrs, pp, size, proc),
  *
  */
 bool_t
-_DEFUN (xdr_pointer, (xdrs, objpp, obj_size, xdr_obj),
-        XDR * xdrs,
+xdr_pointer (XDR * xdrs,
 	char **objpp,
 	u_int obj_size,
 	xdrproc_t xdr_obj)
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 427917640..bf02cf5e7 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -43,8 +43,7 @@
 
 /* ARGSUSED */
 static bool_t
-_DEFUN (x_putlong, (xdrs, longp),
-        XDR * xdrs,
+x_putlong (XDR * xdrs,
 	const long *longp)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -53,8 +52,7 @@ _DEFUN (x_putlong, (xdrs, longp),
 
 /* ARGSUSED */
 static bool_t
-_DEFUN (x_putbytes, (xdrs, bp, len),
-        XDR * xdrs,
+x_putbytes (XDR * xdrs,
 	const char *bp,
 	u_int len)
 {
@@ -63,16 +61,14 @@ _DEFUN (x_putbytes, (xdrs, bp, len),
 }
 
 static u_int
-_DEFUN (x_getpostn, (xdrs),
-        XDR * xdrs)
+x_getpostn (XDR * xdrs)
 {
   return xdrs->x_handy;
 }
 
 /* ARGSUSED */
 static bool_t
-_DEFUN (x_setpostn, (xdrs, pos),
-        XDR * xdrs,
+x_setpostn (XDR * xdrs,
 	u_int pos)
 {
   /* This is not allowed */
@@ -80,8 +76,7 @@ _DEFUN (x_setpostn, (xdrs, pos),
 }
 
 static int32_t *
-_DEFUN (x_inline, (xdrs, len),
-        XDR * xdrs,
+x_inline (XDR * xdrs,
 	u_int len)
 {
   if (len == 0)
@@ -118,8 +113,7 @@ harmless (void)
 }
 
 static void
-_DEFUN (x_destroy, (xdrs),
-        XDR * xdrs)
+x_destroy (XDR * xdrs)
 {
   xdrs->x_handy = 0;
   xdrs->x_base = 0;
@@ -132,8 +126,7 @@ _DEFUN (x_destroy, (xdrs),
 }
 
 static bool_t
-_DEFUN (x_putint32, (xdrs, int32p),
-        XDR *xdrs,
+x_putint32 (XDR *xdrs,
 	const int32_t *int32p)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -142,8 +135,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
 
 
 unsigned long
-_DEFUN (xdr_sizeof, (func, data),
-        xdrproc_t func,
+xdr_sizeof (xdrproc_t func,
 	void *data)
 {
   XDR x;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index e6513e5d0..784ac6c8b 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -83,8 +83,7 @@ static const struct xdr_ops xdrstdio_ops = {
  * Operation flag is set to op.
  */
 void
-_DEFUN (xdrstdio_create, (xdrs, file, op),
-        XDR * xdrs,
+xdrstdio_create (XDR * xdrs,
 	FILE * file,
 	enum xdr_op op)
 {
@@ -100,16 +99,14 @@ _DEFUN (xdrstdio_create, (xdrs, file, op),
  * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
  */
 static void
-_DEFUN (xdrstdio_destroy, (xdrs),
-        XDR * xdrs)
+xdrstdio_destroy (XDR * xdrs)
 {
   (void) fflush ((FILE *) xdrs->x_private);
   /* XXX: should we close the file ?? */
 }
 
 static bool_t
-_DEFUN (xdrstdio_getlong, (xdrs, lp),
-        XDR * xdrs,
+xdrstdio_getlong (XDR * xdrs,
 	long *lp)
 {
   u_int32_t temp;
@@ -121,8 +118,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrstdio_putlong, (xdrs, lp),
-        XDR * xdrs,
+xdrstdio_putlong (XDR * xdrs,
 	const long *lp)
 {
   u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -133,8 +129,7 @@ _DEFUN (xdrstdio_putlong, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrstdio_getbytes (XDR * xdrs,
         char *addr,
 	u_int len)
 {
@@ -145,8 +140,7 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
 }
 
 static bool_t
-_DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrstdio_putbytes (XDR * xdrs,
         const char *addr,
 	u_int len)
 {
@@ -157,15 +151,13 @@ _DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
 }
 
 static u_int
-_DEFUN (xdrstdio_getpos, (xdrs),
-        XDR * xdrs)
+xdrstdio_getpos (XDR * xdrs)
 {
   return ((u_int) ftell ((FILE *) xdrs->x_private));
 }
 
 static bool_t
-_DEFUN (xdrstdio_setpos, (xdrs, pos),
-        XDR * xdrs,
+xdrstdio_setpos (XDR * xdrs,
         u_int pos)
 {
   return ((fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0) ?
@@ -174,8 +166,7 @@ _DEFUN (xdrstdio_setpos, (xdrs, pos),
 
 /* ARGSUSED */
 static int32_t *
-_DEFUN (xdrstdio_inline, (xdrs, len),
-        XDR * xdrs,
+xdrstdio_inline (XDR * xdrs,
 	u_int len)
 {
   /*
@@ -191,8 +182,7 @@ _DEFUN (xdrstdio_inline, (xdrs, len),
 }
 
 static bool_t
-_DEFUN (xdrstdio_getint32, (xdrs, ip),
-        XDR *xdrs,
+xdrstdio_getint32 (XDR *xdrs,
 	int32_t *ip)
 {
   int32_t temp;
@@ -204,8 +194,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrstdio_putint32, (xdrs, ip),
-        XDR *xdrs,
+xdrstdio_putint32 (XDR *xdrs,
 	const int32_t *ip)
 {
   int32_t temp = htonl (*ip);
diff --git a/newlib/libm/common/s_isinf.c b/newlib/libm/common/s_isinf.c
index fe18e2aba..55fd5c214 100644
--- a/newlib/libm/common/s_isinf.c
+++ b/newlib/libm/common/s_isinf.c
@@ -16,8 +16,7 @@
 #undef isinf
 
 int
-_DEFUN (isinf, (x),
-	double x)
+isinf (double x)
 {
 	__int32_t hx,lx;
 	EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/s_isinfd.c b/newlib/libm/common/s_isinfd.c
index 5a2b04d4e..771ce44e4 100644
--- a/newlib/libm/common/s_isinfd.c
+++ b/newlib/libm/common/s_isinfd.c
@@ -9,8 +9,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 int
-_DEFUN (__isinfd, (x),
-	double x)
+__isinfd (double x)
 {
 	__int32_t hx,lx;
 	EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/s_isnand.c b/newlib/libm/common/s_isnand.c
index 5f2c06467..31a3272c5 100644
--- a/newlib/libm/common/s_isnand.c
+++ b/newlib/libm/common/s_isnand.c
@@ -93,8 +93,7 @@ QUICKREF
 #ifndef _DOUBLE_IS_32BITS
 
 int
-_DEFUN (__isnand, (x),
-	double x)
+__isnand (double x)
 {
 	__int32_t hx,lx;
 	EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/sf_isinf.c b/newlib/libm/common/sf_isinf.c
index 5b57a346f..75e90c9fd 100644
--- a/newlib/libm/common/sf_isinf.c
+++ b/newlib/libm/common/sf_isinf.c
@@ -13,8 +13,7 @@
 #undef isinff
 
 int
-_DEFUN (isinff, (x),
-	float x)
+isinff (float x)
 {
 	__int32_t ix;
 	GET_FLOAT_WORD(ix,x);
@@ -27,8 +26,7 @@ _DEFUN (isinff, (x),
 #undef isinf
 
 int
-_DEFUN (isinf, (x),
-	double x)
+isinf (double x)
 {
 	return isinff((float) x);
 }
diff --git a/newlib/libm/common/sf_isinff.c b/newlib/libm/common/sf_isinff.c
index 9d0e742e5..cd7b2cfd3 100644
--- a/newlib/libm/common/sf_isinff.c
+++ b/newlib/libm/common/sf_isinff.c
@@ -6,8 +6,7 @@
 #include "fdlibm.h"
 
 int
-_DEFUN (__isinff, (x),
-	float x)
+__isinff (float x)
 {
 	__int32_t ix;
 	GET_FLOAT_WORD(ix,x);
@@ -18,8 +17,7 @@ _DEFUN (__isinff, (x),
 #ifdef _DOUBLE_IS_32BITS
 
 int
-_DEFUN (__isinfd, (x),
-	double x)
+__isinfd (double x)
 {
 	return __isinff((float) x);
 }
diff --git a/newlib/libm/common/sf_isnan.c b/newlib/libm/common/sf_isnan.c
index 9c813fc24..5c611d67e 100644
--- a/newlib/libm/common/sf_isnan.c
+++ b/newlib/libm/common/sf_isnan.c
@@ -24,8 +24,7 @@
 #undef isnanf
 
 int
-_DEFUN (isnanf, (x),
-	float x)
+isnanf (float x)
 {
 	__int32_t ix;
 	GET_FLOAT_WORD(ix,x);
@@ -38,8 +37,7 @@ _DEFUN (isnanf, (x),
 #undef isnan
 
 int
-_DEFUN (isnan, (x),
-	double x)
+isnan (double x)
 {
 	return isnanf((float) x);
 }
diff --git a/newlib/libm/common/sf_isnanf.c b/newlib/libm/common/sf_isnanf.c
index 0b0d9bbaf..0831da664 100644
--- a/newlib/libm/common/sf_isnanf.c
+++ b/newlib/libm/common/sf_isnanf.c
@@ -16,8 +16,7 @@
 #include "fdlibm.h"
 
 int
-_DEFUN (__isnanf, (x),
-	float x)
+__isnanf (float x)
 {
 	__int32_t ix;
 	GET_FLOAT_WORD(ix,x);
@@ -28,8 +27,7 @@ _DEFUN (__isnanf, (x),
 #ifdef _DOUBLE_IS_32BITS
 
 int
-_DEFUN (__isnand, (x),
-	double x)
+__isnand (double x)
 {
 	return __isnanf((float) x);
 }
diff --git a/newlib/libm/machine/i386/f_math.h b/newlib/libm/machine/i386/f_math.h
index bd44b1e92..833e5cff9 100644
--- a/newlib/libm/machine/i386/f_math.h
+++ b/newlib/libm/machine/i386/f_math.h
@@ -7,8 +7,7 @@
 __inline__
 static 
 int 
-_DEFUN (check_finite, (x),
-         double x)
+check_finite (double x)
 {  
   __int32_t hx;
   GET_HIGH_WORD(hx,x);
@@ -18,8 +17,7 @@ _DEFUN (check_finite, (x),
 __inline__
 static 
 int 
-_DEFUN (check_finitef, (x),
-         float x)
+check_finitef (float x)
 {  
   __int32_t ix;
   GET_FLOAT_WORD(ix,x);
diff --git a/newlib/libm/mathfp/s_acos.c b/newlib/libm/mathfp/s_acos.c
index d66a5cd26..d0318e1c7 100644
--- a/newlib/libm/mathfp/s_acos.c
+++ b/newlib/libm/mathfp/s_acos.c
@@ -75,8 +75,7 @@ MATHREF
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (acos, (double),
-        double x)
+acos (double x)
 {
   return (asine (x, 1));
 }
diff --git a/newlib/libm/mathfp/s_asin.c b/newlib/libm/mathfp/s_asin.c
index 477bbf5cb..b20f0a3f2 100644
--- a/newlib/libm/mathfp/s_asin.c
+++ b/newlib/libm/mathfp/s_asin.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (asin, (double),
-        double x)
+asin (double x)
 {
   return (asine (x, 0));
 }
diff --git a/newlib/libm/mathfp/s_asine.c b/newlib/libm/mathfp/s_asine.c
index 28cfaf7a6..9e9073d1f 100644
--- a/newlib/libm/mathfp/s_asine.c
+++ b/newlib/libm/mathfp/s_asine.c
@@ -89,8 +89,7 @@ static const double a[] = { 0.0, 0.78539816339744830962 };
 static const double b[] = { 1.57079632679489661923, 0.78539816339744830962 };
 
 double
-_DEFUN (asine, (double, int),
-        double x,
+asine (double x,
         int acosine)
 {
   int flag, i;
diff --git a/newlib/libm/mathfp/s_atan.c b/newlib/libm/mathfp/s_atan.c
index 0dd339474..53551e56e 100644
--- a/newlib/libm/mathfp/s_atan.c
+++ b/newlib/libm/mathfp/s_atan.c
@@ -54,8 +54,7 @@ PORTABILITY
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (atan, (double),
-        double x)
+atan (double x)
 {
   switch (numtest (x))
     {
diff --git a/newlib/libm/mathfp/s_atan2.c b/newlib/libm/mathfp/s_atan2.c
index 9f71ed9c8..395253905 100644
--- a/newlib/libm/mathfp/s_atan2.c
+++ b/newlib/libm/mathfp/s_atan2.c
@@ -69,8 +69,7 @@ PORTABILITY
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (atan2, (double, double),
-        double v,
+atan2 (double v,
         double u)
 {
   return (atangent (0.0, v, u, 1));
diff --git a/newlib/libm/mathfp/s_atangent.c b/newlib/libm/mathfp/s_atangent.c
index 1df39ac50..02675b522 100644
--- a/newlib/libm/mathfp/s_atangent.c
+++ b/newlib/libm/mathfp/s_atangent.c
@@ -85,8 +85,7 @@ static const double p[] = { -0.13688768894191926929e+2,
                      -0.83758299368150059274 };
 
 double
-_DEFUN (atangent, (double, double, double, int),
-        double x,
+atangent (double x,
         double v,
         double u,
         int arctan2)
diff --git a/newlib/libm/mathfp/s_ceil.c b/newlib/libm/mathfp/s_ceil.c
index c6ecbe323..29e4a059d 100644
--- a/newlib/libm/mathfp/s_ceil.c
+++ b/newlib/libm/mathfp/s_ceil.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (ceil, (double),
-        double x)
+ceil (double x)
 {
   double f, y;
 
diff --git a/newlib/libm/mathfp/s_cos.c b/newlib/libm/mathfp/s_cos.c
index 6f63a404e..7c4029f9d 100644
--- a/newlib/libm/mathfp/s_cos.c
+++ b/newlib/libm/mathfp/s_cos.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (cos, (double),
-        double x)
+cos (double x)
 {
   return (sine (x, 1));
 }
diff --git a/newlib/libm/mathfp/s_cosh.c b/newlib/libm/mathfp/s_cosh.c
index 552e5ee5c..bfe665069 100644
--- a/newlib/libm/mathfp/s_cosh.c
+++ b/newlib/libm/mathfp/s_cosh.c
@@ -63,8 +63,7 @@ QUICKREF
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (cosh, (double),
-        double x)
+cosh (double x)
 {
   return (sineh (x, 1));
 }
diff --git a/newlib/libm/mathfp/s_exp.c b/newlib/libm/mathfp/s_exp.c
index 362b8b079..bb1beffd7 100644
--- a/newlib/libm/mathfp/s_exp.c
+++ b/newlib/libm/mathfp/s_exp.c
@@ -70,8 +70,7 @@ static const double q[] = { 0.5, 0.56817302698551221787e-1,
                      0.75104028399870046114e-6 };
 
 double
-_DEFUN (exp, (double),
-        double x)
+exp (double x)
 {
   int N;
   double g, z, R, P, Q;
diff --git a/newlib/libm/mathfp/s_exp2.c b/newlib/libm/mathfp/s_exp2.c
index 3bcf7ca2c..c913b3a22 100644
--- a/newlib/libm/mathfp/s_exp2.c
+++ b/newlib/libm/mathfp/s_exp2.c
@@ -9,8 +9,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (exp2, (double),
-        double x)
+exp2 (double x)
 {
   return pow(2.0, x);
 }
diff --git a/newlib/libm/mathfp/s_fabs.c b/newlib/libm/mathfp/s_fabs.c
index 3d6d83889..10e89ef06 100644
--- a/newlib/libm/mathfp/s_fabs.c
+++ b/newlib/libm/mathfp/s_fabs.c
@@ -51,8 +51,7 @@ PORTABILITY
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (fabs, (double),
-        double x)
+fabs (double x)
 {
   switch (numtest (x))
     {
diff --git a/newlib/libm/mathfp/s_floor.c b/newlib/libm/mathfp/s_floor.c
index ebdb9a7b3..e407ea237 100644
--- a/newlib/libm/mathfp/s_floor.c
+++ b/newlib/libm/mathfp/s_floor.c
@@ -62,8 +62,7 @@ PORTABILITY
 #ifndef _DOUBLE_IS_32BITS
 
 double 
-_DEFUN (floor, (double),
-              double x)
+floor (double x)
 {
   double f, y;
 
diff --git a/newlib/libm/mathfp/s_ldexp.c b/newlib/libm/mathfp/s_ldexp.c
index 472093071..6a844e0fe 100644
--- a/newlib/libm/mathfp/s_ldexp.c
+++ b/newlib/libm/mathfp/s_ldexp.c
@@ -63,8 +63,7 @@ PORTABILITY
 #define DOUBLE_EXP_OFFS 1023
 
 double
-_DEFUN (ldexp, (double, int),
-        double d,
+ldexp (double d,
         int e)
 {
   int exp;
diff --git a/newlib/libm/mathfp/s_log.c b/newlib/libm/mathfp/s_log.c
index 27b959831..e1d33e10b 100644
--- a/newlib/libm/mathfp/s_log.c
+++ b/newlib/libm/mathfp/s_log.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (log, (double),
-        double x)
+log (double x)
 {
   return (logarithm (x, 0));
 }
diff --git a/newlib/libm/mathfp/s_log10.c b/newlib/libm/mathfp/s_log10.c
index 9491cff76..d7fed2cfa 100644
--- a/newlib/libm/mathfp/s_log10.c
+++ b/newlib/libm/mathfp/s_log10.c
@@ -51,8 +51,7 @@ PORTABILITY
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (log10, (double),
-        double x)
+log10 (double x)
 {
   return (logarithm (x, 1));
 }
diff --git a/newlib/libm/mathfp/s_logarithm.c b/newlib/libm/mathfp/s_logarithm.c
index d14bf2eb4..e8c24200a 100644
--- a/newlib/libm/mathfp/s_logarithm.c
+++ b/newlib/libm/mathfp/s_logarithm.c
@@ -79,8 +79,7 @@ static const double C2 =  1.428606820309417232e-06;
 static const double C3 =  0.43429448190325182765;
 
 double
-_DEFUN (logarithm, (double, int),
-        double x,
+logarithm (double x,
         int ten)
 {
   int N;
diff --git a/newlib/libm/mathfp/s_numtest.c b/newlib/libm/mathfp/s_numtest.c
index b41bb87f4..a01045fa3 100644
--- a/newlib/libm/mathfp/s_numtest.c
+++ b/newlib/libm/mathfp/s_numtest.c
@@ -25,8 +25,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 int 
-_DEFUN (numtest, (double),
-        double x)
+numtest (double x)
 {
   __uint32_t hx, lx;
   int exp;
diff --git a/newlib/libm/mathfp/s_sin.c b/newlib/libm/mathfp/s_sin.c
index 2051304e0..c394f8548 100644
--- a/newlib/libm/mathfp/s_sin.c
+++ b/newlib/libm/mathfp/s_sin.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (sin, (double),
-        double x)
+sin (double x)
 {
   return (sine (x, 0));
 }
diff --git a/newlib/libm/mathfp/s_sincos.c b/newlib/libm/mathfp/s_sincos.c
index 8fc65ac20..8694dc64d 100644
--- a/newlib/libm/mathfp/s_sincos.c
+++ b/newlib/libm/mathfp/s_sincos.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 void
-_DEFUN (sincos, (x, sinx, cosx),
-        double x,
+sincos (double x,
         double *sinx,
         double *cosx)
 {
diff --git a/newlib/libm/mathfp/s_sine.c b/newlib/libm/mathfp/s_sine.c
index d5e4469a0..7a5f4ddd3 100644
--- a/newlib/libm/mathfp/s_sine.c
+++ b/newlib/libm/mathfp/s_sine.c
@@ -72,8 +72,7 @@ static const double r[] = { -0.16666666666666665052,
                              0.27204790957888846175e-14 };
 
 double
-_DEFUN (sine, (double, int),
-        double x,
+sine (double x,
         int cosine)
 {
   int sgn, N;
diff --git a/newlib/libm/mathfp/s_sineh.c b/newlib/libm/mathfp/s_sineh.c
index 457003ff8..1ca08b84c 100644
--- a/newlib/libm/mathfp/s_sineh.c
+++ b/newlib/libm/mathfp/s_sineh.c
@@ -94,8 +94,7 @@ static const double INV_V2 = 0.24999308500451499336;
 static const double V_OVER2_MINUS1 = 0.13830277879601902638e-4;
 
 double
-_DEFUN (sineh, (double, int),
-        double x,
+sineh (double x,
         int cosineh)
 {
   double y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/mathfp/s_sinf.c b/newlib/libm/mathfp/s_sinf.c
index b738a49b9..3e29fedf3 100644
--- a/newlib/libm/mathfp/s_sinf.c
+++ b/newlib/libm/mathfp/s_sinf.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (sinf, (float),
-        float x)
+sinf (float x)
 {
   return (sinef (x, 0));
 }
diff --git a/newlib/libm/mathfp/s_sinh.c b/newlib/libm/mathfp/s_sinh.c
index c600ee0da..55b339bfb 100644
--- a/newlib/libm/mathfp/s_sinh.c
+++ b/newlib/libm/mathfp/s_sinh.c
@@ -20,8 +20,7 @@
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (sinh, (double),
-        double x)
+sinh (double x)
 {
   return (sineh (x, 0));
 }
diff --git a/newlib/libm/mathfp/s_sqrt.c b/newlib/libm/mathfp/s_sqrt.c
index af3b1d85e..d5df47eec 100644
--- a/newlib/libm/mathfp/s_sqrt.c
+++ b/newlib/libm/mathfp/s_sqrt.c
@@ -62,8 +62,7 @@ PORTABILITY
 #ifndef _DOUBLE_IS_32BITS
 
 double
-_DEFUN (sqrt, (double),
-        double x)
+sqrt (double x)
 {
   double f, y;
   int exp, i, odd;
diff --git a/newlib/libm/mathfp/s_tan.c b/newlib/libm/mathfp/s_tan.c
index 3910a4c49..f3bfb6988 100644
--- a/newlib/libm/mathfp/s_tan.c
+++ b/newlib/libm/mathfp/s_tan.c
@@ -63,8 +63,7 @@ static const double q[] = { -0.46671683339755294240,
                              0.49819433993786512270e-6 };
 
 double
-_DEFUN (tan, (double),
-        double x)
+tan (double x)
 {
   double y, f, g, XN, xnum, xden, res;
   int N;
diff --git a/newlib/libm/mathfp/s_tanh.c b/newlib/libm/mathfp/s_tanh.c
index 7c92c1750..ed036645b 100644
--- a/newlib/libm/mathfp/s_tanh.c
+++ b/newlib/libm/mathfp/s_tanh.c
@@ -69,8 +69,7 @@ static const double q[] = { 0.48402357071988688686e+4,
                             0.11274474380534949335e+3 }; 
 
 double
-_DEFUN (tanh, (double),
-        double x)
+tanh (double x)
 {
   double f, res, g, P, Q, R;
 
diff --git a/newlib/libm/mathfp/sf_acos.c b/newlib/libm/mathfp/sf_acos.c
index 6bef98041..8631f3b97 100644
--- a/newlib/libm/mathfp/sf_acos.c
+++ b/newlib/libm/mathfp/sf_acos.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (acosf, (float),
-        float x)
+acosf (float x)
 {
   return (asinef (x, 1));
 }
diff --git a/newlib/libm/mathfp/sf_asin.c b/newlib/libm/mathfp/sf_asin.c
index 92c33fda3..391ac304e 100644
--- a/newlib/libm/mathfp/sf_asin.c
+++ b/newlib/libm/mathfp/sf_asin.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (asinf, (float),
-        float x)
+asinf (float x)
 {
   return (asinef (x, 0));
 }
diff --git a/newlib/libm/mathfp/sf_asine.c b/newlib/libm/mathfp/sf_asine.c
index a74778034..118479678 100644
--- a/newlib/libm/mathfp/sf_asine.c
+++ b/newlib/libm/mathfp/sf_asine.c
@@ -30,8 +30,7 @@ static const float a[] = { 0.0, 0.785398163 };
 static const float b[] = { 1.570796326, 0.785398163 };
 
 float
-_DEFUN (asinef, (float, int),
-        float x,
+asinef (float x,
         int acosine)
 {
   int flag, i;
diff --git a/newlib/libm/mathfp/sf_atan.c b/newlib/libm/mathfp/sf_atan.c
index f0f522076..03da2a6b0 100644
--- a/newlib/libm/mathfp/sf_atan.c
+++ b/newlib/libm/mathfp/sf_atan.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (atanf, (float),
-        float x)
+atanf (float x)
 {
   switch (numtestf (x))
     {
diff --git a/newlib/libm/mathfp/sf_atan2.c b/newlib/libm/mathfp/sf_atan2.c
index e866ecbb8..dfe1d3375 100644
--- a/newlib/libm/mathfp/sf_atan2.c
+++ b/newlib/libm/mathfp/sf_atan2.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (atan2f, (float, float),
-        float v,
+atan2f (float v,
         float u)
 {
   return (atangentf (0.0, v, u, 1));
diff --git a/newlib/libm/mathfp/sf_atangent.c b/newlib/libm/mathfp/sf_atangent.c
index 1865cde74..2c96e1544 100644
--- a/newlib/libm/mathfp/sf_atangent.c
+++ b/newlib/libm/mathfp/sf_atangent.c
@@ -31,8 +31,7 @@ static const float q[] = { 0.1412500740e+1 };
 static const float p[] = { -0.4708325141, -0.5090958253e-1 };
 
 float
-_DEFUN (atangentf, (float, float, float, int),
-        float x,
+atangentf (float x,
         float v,
         float u,
         int arctan2)
diff --git a/newlib/libm/mathfp/sf_ceil.c b/newlib/libm/mathfp/sf_ceil.c
index bc8e1403b..51ddada1f 100644
--- a/newlib/libm/mathfp/sf_ceil.c
+++ b/newlib/libm/mathfp/sf_ceil.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (ceilf, (float),
-        float x)
+ceilf (float x)
 {
   float f, y;
 
diff --git a/newlib/libm/mathfp/sf_cos.c b/newlib/libm/mathfp/sf_cos.c
index 057663e69..34b7dfdab 100644
--- a/newlib/libm/mathfp/sf_cos.c
+++ b/newlib/libm/mathfp/sf_cos.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (cosf, (float),
-        float x)
+cosf (float x)
 {
   return (sinef (x, 1));
 }
diff --git a/newlib/libm/mathfp/sf_cosh.c b/newlib/libm/mathfp/sf_cosh.c
index 4635b7144..c747e907b 100644
--- a/newlib/libm/mathfp/sf_cosh.c
+++ b/newlib/libm/mathfp/sf_cosh.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (coshf, (float),
-        float x)
+coshf (float x)
 {
   return (sinehf (x, 1));
 }
diff --git a/newlib/libm/mathfp/sf_exp.c b/newlib/libm/mathfp/sf_exp.c
index e37fac58b..33b3529c8 100644
--- a/newlib/libm/mathfp/sf_exp.c
+++ b/newlib/libm/mathfp/sf_exp.c
@@ -30,8 +30,7 @@ static const float p[] = { 0.249999999950, 0.00416028863 };
 static const float q[] = { 0.5, 0.04998717878 };
 
 float
-_DEFUN (expf, (float),
-        float x)
+expf (float x)
 {
   int N;
   float g, z, R, P, Q;
diff --git a/newlib/libm/mathfp/sf_exp2.c b/newlib/libm/mathfp/sf_exp2.c
index 7e147c5ed..43a9ae2df 100644
--- a/newlib/libm/mathfp/sf_exp2.c
+++ b/newlib/libm/mathfp/sf_exp2.c
@@ -7,8 +7,7 @@
 #include "fdlibm.h"
 
 float
-_DEFUN (exp2f, (float),
-        float x)
+exp2f (float x)
 {
   return powf(2.0, x);
 }
diff --git a/newlib/libm/mathfp/sf_fabs.c b/newlib/libm/mathfp/sf_fabs.c
index 2661eabc0..8ee93b162 100644
--- a/newlib/libm/mathfp/sf_fabs.c
+++ b/newlib/libm/mathfp/sf_fabs.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (fabsf, (float),
-        float x)
+fabsf (float x)
 {
   switch (numtestf (x))
     {
diff --git a/newlib/libm/mathfp/sf_floor.c b/newlib/libm/mathfp/sf_floor.c
index 1e0fb9e44..4ba295139 100644
--- a/newlib/libm/mathfp/sf_floor.c
+++ b/newlib/libm/mathfp/sf_floor.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (floorf, (float),
-        float x)
+floorf (float x)
 {
   float f, y;
 
diff --git a/newlib/libm/mathfp/sf_fmod.c b/newlib/libm/mathfp/sf_fmod.c
index 611725409..5dec8a1c9 100644
--- a/newlib/libm/mathfp/sf_fmod.c
+++ b/newlib/libm/mathfp/sf_fmod.c
@@ -25,8 +25,7 @@
 static const float one = 1.0, Zero[] = {0.0, -0.0,};
 
 float
-_DEFUN (fmodf, (float, float),
-        float x,
+fmodf (float x,
         float y)
 {
 	__int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/newlib/libm/mathfp/sf_ldexp.c b/newlib/libm/mathfp/sf_ldexp.c
index 3a0d7a41a..9f05c43a0 100644
--- a/newlib/libm/mathfp/sf_ldexp.c
+++ b/newlib/libm/mathfp/sf_ldexp.c
@@ -23,8 +23,7 @@
 #define FLOAT_EXP_OFFS 127
 
 float
-_DEFUN (ldexpf, (float, int),
-        float d,
+ldexpf (float d,
         int e)
 {
   int exp;
diff --git a/newlib/libm/mathfp/sf_log.c b/newlib/libm/mathfp/sf_log.c
index b746d444f..c988f764f 100644
--- a/newlib/libm/mathfp/sf_log.c
+++ b/newlib/libm/mathfp/sf_log.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (logf, (float),
-        float x)
+logf (float x)
 {
   return (logarithmf (x, 0));
 }
diff --git a/newlib/libm/mathfp/sf_log10.c b/newlib/libm/mathfp/sf_log10.c
index 444e535e0..deb35a378 100644
--- a/newlib/libm/mathfp/sf_log10.c
+++ b/newlib/libm/mathfp/sf_log10.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (log10f, (float),
-        float x)
+log10f (float x)
 {
   return (logarithmf (x, 1));
 }
diff --git a/newlib/libm/mathfp/sf_logarithm.c b/newlib/libm/mathfp/sf_logarithm.c
index 855ee0744..37e57251c 100644
--- a/newlib/libm/mathfp/sf_logarithm.c
+++ b/newlib/libm/mathfp/sf_logarithm.c
@@ -31,8 +31,7 @@ static const float C2 = 1.428606820e-06;
 static const float C3 = 0.4342944819;
 
 float
-_DEFUN (logarithmf, (float, int),
-        float x,
+logarithmf (float x,
         int ten)
 {
   int N;
diff --git a/newlib/libm/mathfp/sf_numtest.c b/newlib/libm/mathfp/sf_numtest.c
index 00bab3a9d..1ad5862b1 100644
--- a/newlib/libm/mathfp/sf_numtest.c
+++ b/newlib/libm/mathfp/sf_numtest.c
@@ -23,8 +23,7 @@
 #include "zmath.h"
 
 int 
-_DEFUN (numtestf, (float),
-        float x)
+numtestf (float x)
 {
   __int32_t wx;
   int exp;
diff --git a/newlib/libm/mathfp/sf_sin.c b/newlib/libm/mathfp/sf_sin.c
index c68e18e50..61ae76b6b 100644
--- a/newlib/libm/mathfp/sf_sin.c
+++ b/newlib/libm/mathfp/sf_sin.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (sinf, (float),
-        float x)
+sinf (float x)
 {
   return (sinef (x, 0));
 }
diff --git a/newlib/libm/mathfp/sf_sincos.c b/newlib/libm/mathfp/sf_sincos.c
index 85b393dce..472aa712b 100644
--- a/newlib/libm/mathfp/sf_sincos.c
+++ b/newlib/libm/mathfp/sf_sincos.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 void
-_DEFUN (sincosf, (x, sinx, cosx),
-        float x,
+sincosf (float x,
         float *sinx,
         float *cosx)
 {
diff --git a/newlib/libm/mathfp/sf_sine.c b/newlib/libm/mathfp/sf_sine.c
index 24725bde1..8dd34d9a1 100644
--- a/newlib/libm/mathfp/sf_sine.c
+++ b/newlib/libm/mathfp/sf_sine.c
@@ -32,8 +32,7 @@ static const float r[] = { -0.1666665668,
                             0.2601903036e-5 };
 
 float
-_DEFUN (sinef, (float, int),
-        float x,
+sinef (float x,
         int cosine)
 {
   int sgn, N;
diff --git a/newlib/libm/mathfp/sf_sineh.c b/newlib/libm/mathfp/sf_sineh.c
index 966e91362..83665bdc3 100644
--- a/newlib/libm/mathfp/sf_sineh.c
+++ b/newlib/libm/mathfp/sf_sineh.c
@@ -32,8 +32,7 @@ static const float INV_V2 = 0.2499930850;
 static const float V_OVER2_MINUS1 = 0.1383027787e-4;
 
 float
-_DEFUN (sinehf, (float, int),
-        float x,
+sinehf (float x,
         int cosineh)
 {
   float y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/mathfp/sf_sinh.c b/newlib/libm/mathfp/sf_sinh.c
index a50e56606..78cbef90d 100644
--- a/newlib/libm/mathfp/sf_sinh.c
+++ b/newlib/libm/mathfp/sf_sinh.c
@@ -18,8 +18,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (sinhf, (float),
-        float x)
+sinhf (float x)
 {
   return (sinehf (x, 0));
 }
diff --git a/newlib/libm/mathfp/sf_sqrt.c b/newlib/libm/mathfp/sf_sqrt.c
index 5d5410dce..ede24b987 100644
--- a/newlib/libm/mathfp/sf_sqrt.c
+++ b/newlib/libm/mathfp/sf_sqrt.c
@@ -32,8 +32,7 @@
 #include "zmath.h"
 
 float
-_DEFUN (sqrtf, (float),
-        float x)
+sqrtf (float x)
 {
   float f, y;
   int exp, i, odd;
diff --git a/newlib/libm/mathfp/sf_tan.c b/newlib/libm/mathfp/sf_tan.c
index fcde19ab3..7924bd217 100644
--- a/newlib/libm/mathfp/sf_tan.c
+++ b/newlib/libm/mathfp/sf_tan.c
@@ -29,8 +29,7 @@ static const float q[] = { -0.429135777,
                             0.971685835e-2 };
 
 float
-_DEFUN (tanf, (float),
-        float x)
+tanf (float x)
 {
   float y, f, g, XN, xnum, xden, res;
   int N;
diff --git a/newlib/libm/mathfp/sf_tanh.c b/newlib/libm/mathfp/sf_tanh.c
index 51806af45..7da600a9c 100644
--- a/newlib/libm/mathfp/sf_tanh.c
+++ b/newlib/libm/mathfp/sf_tanh.c
@@ -31,8 +31,7 @@ static const float q[] = {  0.6178299136,
                             0.25 };
 
 float
-_DEFUN (tanhf, (float),
-        float x)
+tanhf (float x)
 {
   float f, res, g, P, Q, R;
 
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index 24188fa8b..fe5bc0aa4 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -49,8 +49,7 @@ test_atoff (void)
 
 static
 void 
-_DEFUN(iterate,(func, name),
-       void _EXFUN((*func),(void)),
+iterate (void _EXFUN((*func),(void)),
        char *name)
 {
 
@@ -70,8 +69,7 @@ int_type *p = ints;
 
 
 static void
-_DEFUN(int_iterate,(func, name),
-       void (*func)(),
+int_iterate (void (*func)(),
        char *name)
 {
   newfunc(name);
@@ -86,8 +84,7 @@ _DEFUN(int_iterate,(func, name),
 }
 
 void
-_DEFUN(test_strtol_base,(base, pi, string),
-       int base,
+test_strtol_base (int base,
        int_scan_type *pi,
        char *string)
 {
@@ -206,8 +203,7 @@ test_fcvt (void)
 
 static void
 
-_DEFUN(diterate,(func, name),
-       void (*func)(),
+diterate (void (*func)(),
        char *name)
 {
   newfunc(name);
diff --git a/newlib/libm/test/dcvt.c b/newlib/libm/test/dcvt.c
index 922652e9f..56d5c2b6b 100644
--- a/newlib/libm/test/dcvt.c
+++ b/newlib/libm/test/dcvt.c
@@ -28,8 +28,7 @@ static struct p {
 #define _MAX_PREC 16
 
 static char 
-_DEFUN(nextdigit,(value),
-double *value)
+nextdigit (double *value)
 {
   double tmp;
   
@@ -39,8 +38,7 @@ double *value)
 
 
 static char *
-_DEFUN(print_nan,(buffer, value, precision),
-       char *buffer,
+print_nan (char *buffer,
        double value,
        int precision)
 {
@@ -100,8 +98,7 @@ typedef struct
 
 
 void
-_DEFUN(renormalize,(in),
-       cvt_info_type *in)
+renormalize (cvt_info_type *in)
 {
 
   /* Make sure all numbers are less than 1 */
@@ -133,8 +130,7 @@ _DEFUN(renormalize,(in),
  */
 
 static void 
-_DEFUN(normalize,(value, in),
-       double value,
+normalize (double value,
        cvt_info_type *in)
 {
   int j;
@@ -195,8 +191,7 @@ _DEFUN(normalize,(value, in),
   
 }
 int
-_DEFUN(round,(in, start, now, ch),
-       cvt_info_type *in,
+round (cvt_info_type *in,
        char *start,
        char *now,
        char ch)
@@ -272,8 +267,7 @@ _DEFUN(round,(in, start, now, ch),
 
 
 void
-_DEFUN(_cvte,(in),
-       register  cvt_info_type *in)
+_cvte (register  cvt_info_type *in)
 {
   int buffer_idx  =0;
   int digit = 0;
@@ -341,8 +335,7 @@ _DEFUN(_cvte,(in),
 
 /* Produce NNNN.FFFF */
 void
-_DEFUN(_cvtf,(in),
-       cvt_info_type *in)
+_cvtf (cvt_info_type *in)
 {
   
   int buffer_idx = 0;		/* Current char being output */
@@ -434,8 +427,7 @@ _DEFUN(_cvtf,(in),
 
 
 char *
-_DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
-       char *buffer,
+_dcvt (char *buffer,
        double invalue,
        int precision,
        int width,
@@ -533,8 +525,7 @@ _DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
 
 
 char *
-_DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
-       double invalue,
+fcvtbuf (double invalue,
        int ndigit,
        int *decpt,
        int *sign,
@@ -563,8 +554,7 @@ _DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
 
 
 char *
-_DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
-       double invalue,
+ecvtbuf (double invalue,
        int ndigit,
        int *decpt,
        int *sign,
@@ -596,8 +586,7 @@ _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
 
 
 char *
-_DEFUN(gcvt,(d,ndigit,buf),
-   double d,
+gcvt (double d,
    int ndigit,
    char *buf)
 {
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index f58f64f79..dda587a33 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -35,8 +35,7 @@ int verbose;
 
 /* To test exceptions - we trap them all and return a known value */
 int
-_DEFUN(matherr,(e),
-       struct exception *e)
+matherr (struct exception *e)
 {
   if (traperror) 
   {
@@ -50,8 +49,7 @@ _DEFUN(matherr,(e),
 }
 
 
-void _DEFUN(translate_to,(file,r),
-	    FILE *file,
+void translate_to (FILE *file,
 	    double r)
 {
   __ieee_double_shape_type bits;
@@ -60,8 +58,7 @@ void _DEFUN(translate_to,(file,r),
 }
 
 int 
-_DEFUN(ffcheck,( is, p, name, serrno, merror),
-       double is,
+ffcheck (double is,
        one_line_type *p,
        char *name,
        int serrno,
@@ -108,8 +105,7 @@ _DEFUN(ffcheck,( is, p, name, serrno, merror),
 }
 
 double
-_DEFUN(thedouble, (msw, lsw),
-       long msw,
+thedouble (long msw,
        long lsw)
 {
   __ieee_double_shape_type x;
@@ -123,8 +119,7 @@ int calc;
 int reduce;
 
 
-_DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
-       FILE *f,
+frontline (FILE *f,
        int mag,
        one_line_type *p,
        double result,
@@ -176,8 +171,7 @@ _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
   fprintf(f, ")*/\n");      
 }
 
-_DEFUN(finish,(f, vector,  result , p, args, name),
-       FILE *f,
+finish (FILE *f,
        int vector,
        double result,
        one_line_type *p,
@@ -194,8 +188,7 @@ _DEFUN(finish,(f, vector,  result , p, args, name),
 } 
 int redo;  
 
-_DEFUN(run_vector_1,(vector, p, func, name, args),
-       int vector,
+run_vector_1 (int vector,
        one_line_type *p,
        char *func,
        char *name,
@@ -429,12 +422,12 @@ test_math (void)
 */
 
 #if 0
-float _DEFUN(cosf,(a), float a) { return cos((double)a); }
-float _DEFUN(sinf,(a), float  a) { return sin((double)a); }
-float _DEFUN(log1pf,(a), float a) { return log1p((double)a); }
-float _DEFUN(tanf,(a), float a) { return tan((double)a); }
-float _DEFUN(ceilf,(a), float a) { return ceil(a); }
-float _DEFUN(floorf,(a), float a) { return floor(a); }
+float cosf (float a) { return cos((double)a); }
+float sinf (float  a) { return sin((double)a); }
+float log1pf (float a) { return log1p((double)a); }
+float tanf (float a) { return tan((double)a); }
+float ceilf (float a) { return ceil(a); }
+float floorf (float a) { return floor(a); }
 #endif
 
 /*ndef HAVE_FLOAT*/
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index e66117fb6..a8cc1a16f 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -10,8 +10,7 @@ int  errors = 0;
 #define check(thing) checkit(thing, __LINE__)
 
 void
-_DEFUN(checkit,(ok,l),
-       int ok,
+checkit (int ok,
        int l )
 
 {
@@ -31,8 +30,7 @@ _DEFUN(checkit,(ok,l),
 #define equal(a, b)  funcqual(a,b,__LINE__);
 
 void
-_DEFUN(funcqual,(a,b,l),
-       char *a,
+funcqual (char *a,
        char *b,
        int l)
 {
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index 365c4c843..7769e2b36 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -9,8 +9,7 @@ int inacc;
 
 
 int
-_DEFUN(main,(ac, av),
-       int ac,
+main (int ac,
        char **av)
 {
   int i;
@@ -57,8 +56,7 @@ bt();
 
 static const char *iname = "foo";
 void 
-_DEFUN(newfunc,(string),
-       const char *string)
+newfunc (const char *string)
 {
   if (strcmp(iname, string)) 
   {
@@ -92,8 +90,7 @@ int reduce = 0;
 int strtod_vector = 0;
 
 int 
-_DEFUN(bigger,(a,b),
-	   __ieee_double_shape_type *a,
+bigger (__ieee_double_shape_type *a,
 	   __ieee_double_shape_type *b)
 {
 
@@ -116,8 +113,7 @@ _DEFUN(bigger,(a,b),
 
 /* Return the first bit different between two double numbers */
 int 
-_DEFUN(mag_of_error,(is, shouldbe),
-       double is,
+mag_of_error (double is,
        double shouldbe)
 {
   __ieee_double_shape_type a,b;
@@ -183,8 +179,7 @@ _DEFUN(mag_of_error,(is, shouldbe),
 
 
 void
-_DEFUN(test_sok,(is, shouldbe),
-       char *is,
+test_sok (char *is,
        char *shouldbe)
 {
   if (strcmp(is,shouldbe))
@@ -197,8 +192,7 @@ _DEFUN(test_sok,(is, shouldbe),
   }
 }
 void
-_DEFUN(test_iok,(is, shouldbe),
-       int is,
+test_iok (int is,
        int shouldbe)
 {
   if (is != shouldbe){
@@ -215,8 +209,7 @@ _DEFUN(test_iok,(is, shouldbe),
    prec float conversions against double results
 */
 void 
-_DEFUN(test_scok,(is, shouldbe, count),
-       char *is,
+test_scok (char *is,
        char *shouldbe,
        int count)
 {
@@ -231,8 +224,7 @@ _DEFUN(test_scok,(is, shouldbe, count),
 }
 
 void
-_DEFUN(test_eok,(is, shouldbe),
-       int is,
+test_eok (int is,
        int shouldbe)
 {
   if (is != shouldbe){
@@ -245,8 +237,7 @@ _DEFUN(test_eok,(is, shouldbe),
 }
 
 void
-_DEFUN(test_mok,(value, shouldbe, okmag),
-       double value,
+test_mok (double value,
        double shouldbe,
        int okmag)
 {
diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c
index 167a40c87..f23ceba6d 100644
--- a/newlib/libm/test/test_ieee.c
+++ b/newlib/libm/test/test_ieee.c
@@ -82,8 +82,7 @@ test_getroundtoi (void)
 }
 
 double
- _DEFUN(dnumber,(msw, lsw),
-	int msw,
+ dnumber (int msw,
 	int lsw)
 {
   
diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c
index c4c8e2fdb..ac8f79c49 100644
--- a/newlib/libm/test/test_is.c
+++ b/newlib/libm/test/test_is.c
@@ -18,8 +18,7 @@ int mygraph;
 int mypunct;
 
 void
-_DEFUN(test_is_single,(i),
-       int i)
+test_is_single (int i)
 {
   setascii = 0;
   setlower = 0;
@@ -1913,28 +1912,27 @@ _DEFUN(test_is_single,(i),
 }
 
 
-int _DEFUN(def_isascii,(i), int i) { return isascii(i); }
-int _DEFUN(def_iscntrl,(i), int i) { return iscntrl(i); }
-int _DEFUN(def_isspace,(i), int i) { return isspace(i); }
-int _DEFUN(def_isprint,(i), int i) { return isprint(i); }
-int _DEFUN(def_isalnum,(i), int i) { return isalnum(i); }
-int _DEFUN(def_isdigit,(i), int i) { return isdigit(i); }
-int _DEFUN(def_isxdigit,(i), int i) { return isxdigit(i); }
-int _DEFUN(def_isalpha,(i), int i) { return isalpha(i); }
-int _DEFUN(def_isupper,(i), int i) { return isupper(i); }
-int _DEFUN(def_islower,(i), int i) { return islower(i); }
-int _DEFUN(def_isgraph,(i), int i) { return isgraph(i); }
-int _DEFUN(def_ispunct,(i), int i) { return ispunct(i); }
-int _DEFUN(def_tolower,(i), int i) { return tolower(i); }
-int _DEFUN(def_toupper,(i), int i) { return toupper(i); }
-int _DEFUN(def_toascii,(i), int i) { return toascii(i); }
-int _DEFUN(def__tolower,(i), int i) { return _tolower(i); }
-int _DEFUN(def__toupper,(i), int i) { return _toupper(i); }
+int def_isascii (int i) { return isascii(i); }
+int def_iscntrl (int i) { return iscntrl(i); }
+int def_isspace (int i) { return isspace(i); }
+int def_isprint (int i) { return isprint(i); }
+int def_isalnum (int i) { return isalnum(i); }
+int def_isdigit (int i) { return isdigit(i); }
+int def_isxdigit (int i) { return isxdigit(i); }
+int def_isalpha (int i) { return isalpha(i); }
+int def_isupper (int i) { return isupper(i); }
+int def_islower (int i) { return islower(i); }
+int def_isgraph (int i) { return isgraph(i); }
+int def_ispunct (int i) { return ispunct(i); }
+int def_tolower (int i) { return tolower(i); }
+int def_toupper (int i) { return toupper(i); }
+int def_toascii (int i) { return toascii(i); }
+int def__tolower (int i) { return _tolower(i); }
+int def__toupper (int i) { return _toupper(i); }
 
 extern int inacc;
 void
-_DEFUN(test_is_set,(func, name, p),
-       int (*func)(),
+test_is_set (int (*func)(),
        char *name,
        int *p)
 {
@@ -1952,8 +1950,7 @@ _DEFUN(test_is_set,(func, name, p),
   }
 }
 void
-_DEFUN(test_to_set,(func, name, p, low, high),
-       int (*func)(),
+test_to_set (int (*func)(),
        char *name,
        int *p,
        int low,
