[PATCH v2 00/17] Newlib ANSI-fication

classic Classic list List threaded Threaded
24 messages Options
12
Reply | Threaded
Open this post in threaded view
|

[PATCH v2 00/17] Newlib ANSI-fication

Yaakov Selkowitz-2
Yaakov Selkowitz (17):
  ansification: remove _AND
  ansification: remove _CONST
  ansification: remove _DOTS
  ansification: remove _NOARGS
  ansification: remove _PARAMS
  ansification: remove _VOID_PTR
  ansification: remove _PTR
  ansification: remove _CAST_VOID
  ansification: remove _DEFUN_VOID
  ansification: remove _VOID
  ansification: remove _VOLATILE, _SIGNED
  ansification: remove _DEFUN
  ansification: remove _EXFNPTR, _EXPARM
  ansification: remove _EXFUN, _EXFUN_NOTHROW
  ansification: remove _HAVE_STDC
  ansification: fix makedoc for ANSI C
  ansification: remove ansidecl.h from makedoc

 libgloss/aarch64/_exit.c                     |   2 +-
 libgloss/aarch64/_kill.c                     |   2 +-
 libgloss/aarch64/svc.h                       |   6 +-
 libgloss/aarch64/syscalls.c                  |  64 +--
 libgloss/arm/_exit.c                         |   4 +-
 libgloss/arm/_kill.c                         |   2 +-
 libgloss/arm/swi.h                           |   6 +-
 libgloss/arm/syscalls.c                      |  64 +--
 libgloss/bfin/_exit.c                        |   5 +-
 libgloss/close.c                             |   3 +-
 libgloss/cr16/fstat.c                        |   3 +-
 libgloss/cr16/getpid.c                       |   3 +-
 libgloss/cr16/isatty.c                       |   5 +-
 libgloss/cr16/kill.c                         |   3 +-
 libgloss/cr16/putnum.c                       |   3 +-
 libgloss/cr16/stat.c                         |   3 +-
 libgloss/crx/fstat.c                         |   3 +-
 libgloss/crx/getpid.c                        |   3 +-
 libgloss/crx/isatty.c                        |   5 +-
 libgloss/crx/kill.c                          |   3 +-
 libgloss/crx/putnum.c                        |   3 +-
 libgloss/crx/stat.c                          |   3 +-
 libgloss/epiphany/_isatty.c                  |   2 +-
 libgloss/frv/fstat.c                         |   3 +-
 libgloss/frv/getpid.c                        |   3 +-
 libgloss/frv/isatty.c                        |   5 +-
 libgloss/frv/kill.c                          |   3 +-
 libgloss/frv/print.c                         |   3 +-
 libgloss/frv/putnum.c                        |   3 +-
 libgloss/frv/sim-time.c                      |   9 +-
 libgloss/frv/stat.c                          |   3 +-
 libgloss/fstat.c                             |   3 +-
 libgloss/ft32/fstat.c                        |   3 +-
 libgloss/ft32/getpid.c                       |   3 +-
 libgloss/ft32/isatty.c                       |   5 +-
 libgloss/ft32/kill.c                         |   3 +-
 libgloss/ft32/sim-lseek.S                    |   5 +-
 libgloss/ft32/sim-lseek.c                    |   5 +-
 libgloss/ft32/sim-time.c                     |   6 +-
 libgloss/ft32/stat.c                         |   3 +-
 libgloss/getpid.c                            |   3 +-
 libgloss/isatty.c                            |   5 +-
 libgloss/kill.c                              |   3 +-
 libgloss/libnosys/_exit.c                    |   5 +-
 libgloss/libnosys/chown.c                    |   5 +-
 libgloss/libnosys/close.c                    |   3 +-
 libgloss/libnosys/execve.c                   |   5 +-
 libgloss/libnosys/fork.c                     |   3 +-
 libgloss/libnosys/fstat.c                    |   3 +-
 libgloss/libnosys/getpid.c                   |   3 +-
 libgloss/libnosys/gettod.c                   |   3 +-
 libgloss/libnosys/isatty.c                   |   3 +-
 libgloss/libnosys/kill.c                     |   3 +-
 libgloss/libnosys/link.c                     |   3 +-
 libgloss/libnosys/lseek.c                    |   5 +-
 libgloss/libnosys/open.c                     |   5 +-
 libgloss/libnosys/read.c                     |   5 +-
 libgloss/libnosys/readlink.c                 |   5 +-
 libgloss/libnosys/stat.c                     |   3 +-
 libgloss/libnosys/symlink.c                  |   3 +-
 libgloss/libnosys/times.c                    |   3 +-
 libgloss/libnosys/unlink.c                   |   3 +-
 libgloss/libnosys/wait.c                     |   3 +-
 libgloss/libnosys/write.c                    |   5 +-
 libgloss/lm32/isatty.c                       |   3 +-
 libgloss/lseek.c                             |   5 +-
 libgloss/m68k/idp-inbyte.c                   |   2 +-
 libgloss/m68k/idp-outbyte.c                  |   6 +-
 libgloss/m68k/mc68ec.c                       |   6 +-
 libgloss/m68k/mvme-stub.c                    |   8 +-
 libgloss/mcore/close.c                       |   3 +-
 libgloss/mcore/cmb-exit.c                    |   3 +-
 libgloss/mcore/cmb-inbyte.c                  |   3 +-
 libgloss/mcore/cmb-outbyte.c                 |   3 +-
 libgloss/mcore/fstat.c                       |   3 +-
 libgloss/mcore/getpid.c                      |   3 +-
 libgloss/mcore/kill.c                        |   3 +-
 libgloss/mcore/lseek.c                       |   5 +-
 libgloss/mcore/open.c                        |   5 +-
 libgloss/mcore/print.c                       |   3 +-
 libgloss/mcore/putnum.c                      |   3 +-
 libgloss/mcore/raise.c                       |   3 +-
 libgloss/mcore/read.c                        |   7 +-
 libgloss/mcore/stat.c                        |   3 +-
 libgloss/mcore/unlink.c                      |   3 +-
 libgloss/mcore/write.c                       |   7 +-
 libgloss/moxie/fstat.c                       |   3 +-
 libgloss/moxie/getpid.c                      |   3 +-
 libgloss/moxie/isatty.c                      |   5 +-
 libgloss/moxie/kill.c                        |   3 +-
 libgloss/moxie/print.c                       |   3 +-
 libgloss/moxie/putnum.c                      |   3 +-
 libgloss/moxie/qemu-time.c                   |   9 +-
 libgloss/moxie/sim-lseek.S                   |   5 +-
 libgloss/moxie/sim-lseek.c                   |   5 +-
 libgloss/moxie/sim-time.c                    |   9 +-
 libgloss/moxie/stat.c                        |   3 +-
 libgloss/open.c                              |   5 +-
 libgloss/print.c                             |   3 +-
 libgloss/putnum.c                            |   3 +-
 libgloss/read.c                              |   7 +-
 libgloss/sparc_leon/asm-leon/clock.h         |   4 +-
 libgloss/sparc_leon/console_dbg.c            |   4 -
 libgloss/spu/getpid.c                        |   2 +-
 libgloss/stat.c                              |   3 +-
 libgloss/tic6x/getpid.c                      |   3 +-
 libgloss/tic6x/kill.c                        |   3 +-
 libgloss/unlink.c                            |   3 +-
 libgloss/write.c                             |   7 +-
 libgloss/xc16x/misc.c                        |   8 +-
 libgloss/xstormy16/close.c                   |   3 +-
 libgloss/xstormy16/fstat.c                   |   3 +-
 libgloss/xstormy16/getpid.c                  |   3 +-
 libgloss/xstormy16/isatty.c                  |   5 +-
 libgloss/xstormy16/kill.c                    |   3 +-
 libgloss/xstormy16/lseek.c                   |   5 +-
 libgloss/xstormy16/open.c                    |   5 +-
 libgloss/xstormy16/stat.c                    |   3 +-
 libgloss/xstormy16/unlink.c                  |   3 +-
 newlib/doc/ansidecl.h                        | 116 -----
 newlib/doc/makedoc.c                         | 136 +++---
 newlib/libc/argz/argz_add.c                  |   5 +-
 newlib/libc/argz/argz_add_sep.c              |   7 +-
 newlib/libc/argz/argz_append.c               |   7 +-
 newlib/libc/argz/argz_count.c                |   3 +-
 newlib/libc/argz/argz_create.c               |   5 +-
 newlib/libc/argz/argz_create_sep.c           |   7 +-
 newlib/libc/argz/argz_delete.c               |   5 +-
 newlib/libc/argz/argz_extract.c              |   5 +-
 newlib/libc/argz/argz_insert.c               |   7 +-
 newlib/libc/argz/argz_next.c                 |   5 +-
 newlib/libc/argz/argz_replace.c              |   9 +-
 newlib/libc/argz/argz_stringify.c            |   5 +-
 newlib/libc/argz/envz_add.c                  |   7 +-
 newlib/libc/argz/envz_entry.c                |   5 +-
 newlib/libc/argz/envz_get.c                  |   5 +-
 newlib/libc/argz/envz_merge.c                |   9 +-
 newlib/libc/argz/envz_remove.c               |   5 +-
 newlib/libc/argz/envz_strip.c                |   3 +-
 newlib/libc/ctype/ctype_.c                   |   6 +-
 newlib/libc/ctype/ctype_.h                   |   2 +-
 newlib/libc/ctype/ctype_cp.h                 |   4 +-
 newlib/libc/ctype/ctype_iso.h                |   4 +-
 newlib/libc/ctype/isalnum.c                  |   2 +-
 newlib/libc/ctype/isalpha.c                  |   2 +-
 newlib/libc/ctype/isascii.c                  |   2 +-
 newlib/libc/ctype/isblank.c                  |   2 +-
 newlib/libc/ctype/iscntrl.c                  |   2 +-
 newlib/libc/ctype/isdigit.c                  |   2 +-
 newlib/libc/ctype/islower.c                  |   2 +-
 newlib/libc/ctype/isprint.c                  |   4 +-
 newlib/libc/ctype/ispunct.c                  |   2 +-
 newlib/libc/ctype/isspace.c                  |   2 +-
 newlib/libc/ctype/isupper.c                  |   2 +-
 newlib/libc/ctype/iswalnum.c                 |   2 +-
 newlib/libc/ctype/iswalpha.c                 |   2 +-
 newlib/libc/ctype/iswblank.c                 |   2 +-
 newlib/libc/ctype/iswcntrl.c                 |   2 +-
 newlib/libc/ctype/iswctype.c                 |   2 +-
 newlib/libc/ctype/iswdigit.c                 |   2 +-
 newlib/libc/ctype/iswgraph.c                 |   2 +-
 newlib/libc/ctype/iswlower.c                 |   2 +-
 newlib/libc/ctype/iswprint.c                 |   2 +-
 newlib/libc/ctype/iswpunct.c                 |   2 +-
 newlib/libc/ctype/iswspace.c                 |   2 +-
 newlib/libc/ctype/iswupper.c                 |   2 +-
 newlib/libc/ctype/iswxdigit.c                |   2 +-
 newlib/libc/ctype/isxdigit.c                 |   2 +-
 newlib/libc/ctype/jp2uc.c                    |   4 +-
 newlib/libc/ctype/local.h                    |   2 +-
 newlib/libc/ctype/toascii.c                  |   2 +-
 newlib/libc/ctype/tolower.c                  |   2 +-
 newlib/libc/ctype/toupper.c                  |   2 +-
 newlib/libc/ctype/towctrans.c                |   8 +-
 newlib/libc/ctype/towlower.c                 |   2 +-
 newlib/libc/ctype/towupper.c                 |   2 +-
 newlib/libc/ctype/wctrans.c                  |   6 +-
 newlib/libc/ctype/wctype.c                   |   6 +-
 newlib/libc/iconv/ccs/big5.c                 |  10 +-
 newlib/libc/iconv/ccs/ccs.h                  |  10 +-
 newlib/libc/iconv/ccs/ccsbi.c                |   2 +-
 newlib/libc/iconv/ccs/ccsbi.h                |  82 ++--
 newlib/libc/iconv/ccs/cns11643_plane1.c      |  10 +-
 newlib/libc/iconv/ccs/cns11643_plane14.c     |  10 +-
 newlib/libc/iconv/ccs/cns11643_plane2.c      |  10 +-
 newlib/libc/iconv/ccs/cp775.c                |   6 +-
 newlib/libc/iconv/ccs/cp850.c                |   6 +-
 newlib/libc/iconv/ccs/cp852.c                |   6 +-
 newlib/libc/iconv/ccs/cp855.c                |   6 +-
 newlib/libc/iconv/ccs/cp866.c                |   6 +-
 newlib/libc/iconv/ccs/iso_8859_1.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_10.c          |   6 +-
 newlib/libc/iconv/ccs/iso_8859_11.c          |   6 +-
 newlib/libc/iconv/ccs/iso_8859_13.c          |   6 +-
 newlib/libc/iconv/ccs/iso_8859_14.c          |   6 +-
 newlib/libc/iconv/ccs/iso_8859_15.c          |   6 +-
 newlib/libc/iconv/ccs/iso_8859_2.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_3.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_4.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_5.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_6.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_7.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_8.c           |   6 +-
 newlib/libc/iconv/ccs/iso_8859_9.c           |   6 +-
 newlib/libc/iconv/ccs/iso_ir_111.c           |   6 +-
 newlib/libc/iconv/ccs/jis_x0201_1976.c       |   6 +-
 newlib/libc/iconv/ccs/jis_x0208_1990.c       |  10 +-
 newlib/libc/iconv/ccs/jis_x0212_1990.c       |  10 +-
 newlib/libc/iconv/ccs/koi8_r.c               |   6 +-
 newlib/libc/iconv/ccs/koi8_ru.c              |   6 +-
 newlib/libc/iconv/ccs/koi8_u.c               |   6 +-
 newlib/libc/iconv/ccs/koi8_uni.c             |   6 +-
 newlib/libc/iconv/ccs/ksx1001.c              |  10 +-
 newlib/libc/iconv/ccs/mktbl.pl               |  14 +-
 newlib/libc/iconv/ccs/win_1250.c             |   6 +-
 newlib/libc/iconv/ccs/win_1251.c             |   6 +-
 newlib/libc/iconv/ccs/win_1252.c             |   6 +-
 newlib/libc/iconv/ccs/win_1253.c             |   6 +-
 newlib/libc/iconv/ccs/win_1254.c             |   6 +-
 newlib/libc/iconv/ccs/win_1255.c             |   6 +-
 newlib/libc/iconv/ccs/win_1256.c             |   6 +-
 newlib/libc/iconv/ccs/win_1257.c             |   6 +-
 newlib/libc/iconv/ccs/win_1258.c             |   6 +-
 newlib/libc/iconv/ces/cesbi.c                |  68 +--
 newlib/libc/iconv/ces/cesbi.h                |  40 +-
 newlib/libc/iconv/ces/euc.c                  |  57 +--
 newlib/libc/iconv/ces/mkdeps.pl              |  24 +-
 newlib/libc/iconv/ces/table-pcs.c            |  46 +-
 newlib/libc/iconv/ces/table.c                | 124 +++--
 newlib/libc/iconv/ces/ucs-2-internal.c       |  19 +-
 newlib/libc/iconv/ces/ucs-2.c                |  35 +-
 newlib/libc/iconv/ces/ucs-4-internal.c       |  19 +-
 newlib/libc/iconv/ces/ucs-4.c                |  35 +-
 newlib/libc/iconv/ces/us-ascii.c             |  19 +-
 newlib/libc/iconv/ces/utf-16.c               |  46 +-
 newlib/libc/iconv/ces/utf-8.c                |  21 +-
 newlib/libc/iconv/lib/aliasesbi.c            |   2 +-
 newlib/libc/iconv/lib/aliasesi.c             |  41 +-
 newlib/libc/iconv/lib/conv.h                 |  60 +--
 newlib/libc/iconv/lib/iconv.c                |  63 ++-
 newlib/libc/iconv/lib/iconvnls.c             |  78 ++--
 newlib/libc/iconv/lib/local.h                |   5 +-
 newlib/libc/iconv/lib/nullconv.c             |  50 +-
 newlib/libc/iconv/lib/ucsconv.c              |  73 ++-
 newlib/libc/iconv/lib/ucsconv.h              |  88 ++--
 newlib/libc/include/_ansi.h                  |  60 +--
 newlib/libc/include/alloca.h                 |   2 +-
 newlib/libc/include/assert.h                 |   8 +-
 newlib/libc/include/ctype.h                  |  34 +-
 newlib/libc/include/envlock.h                |   4 +-
 newlib/libc/include/getopt.h                 |  28 +-
 newlib/libc/include/iconv.h                  |  16 +-
 newlib/libc/include/ieeefp.h                 |  16 +-
 newlib/libc/include/libgen.h                 |   4 +-
 newlib/libc/include/locale.h                 |   8 +-
 newlib/libc/include/machine/fastmath.h       |   2 -
 newlib/libc/include/malloc.h                 |  54 +--
 newlib/libc/include/math.h                   | 448 +++++++++---------
 newlib/libc/include/pthread.h                | 352 +++++++-------
 newlib/libc/include/reent.h                  |  50 +-
 newlib/libc/include/rpc/xdr.h                | 128 +++---
 newlib/libc/include/setjmp.h                 |   6 +-
 newlib/libc/include/signal.h                 |  10 +-
 newlib/libc/include/spawn.h                  |  81 ++--
 newlib/libc/include/stdio.h                  | 662 +++++++++++++--------------
 newlib/libc/include/stdio_ext.h              |  18 +-
 newlib/libc/include/stdlib.h                 | 276 +++++------
 newlib/libc/include/string.h                 | 104 ++---
 newlib/libc/include/sys/_default_fcntl.h     |  18 +-
 newlib/libc/include/sys/errno.h              |   4 +-
 newlib/libc/include/sys/iconvnls.h           |  28 +-
 newlib/libc/include/sys/lock.h               |  20 +-
 newlib/libc/include/sys/reent.h              |  42 +-
 newlib/libc/include/sys/resource.h           |   2 +-
 newlib/libc/include/sys/signal.h             |  47 +-
 newlib/libc/include/sys/stat.h               |  42 +-
 newlib/libc/include/sys/stdio.h              |   4 +-
 newlib/libc/include/sys/time.h               |  24 +-
 newlib/libc/include/sys/timeb.h              |   2 +-
 newlib/libc/include/sys/times.h              |   4 +-
 newlib/libc/include/sys/unistd.h             | 266 +++++------
 newlib/libc/include/time.h                   |  85 ++--
 newlib/libc/include/unctrl.h                 |   4 +-
 newlib/libc/include/wchar.h                  | 326 ++++++-------
 newlib/libc/include/wctype.h                 |  36 +-
 newlib/libc/locale/locale.c                  |  14 +-
 newlib/libc/locale/localeconv.c              |   5 +-
 newlib/libc/machine/cris/sys/errno.h         |   4 +-
 newlib/libc/machine/cris/sys/fcntl.h         |  12 +-
 newlib/libc/machine/microblaze/abort.c       |   4 +-
 newlib/libc/machine/microblaze/strcmp.c      |   5 +-
 newlib/libc/machine/microblaze/strcpy.c      |   9 +-
 newlib/libc/machine/microblaze/strlen.c      |   7 +-
 newlib/libc/machine/nds32/abort.c            |   4 +-
 newlib/libc/machine/powerpc/atosfix16.c      |   8 +-
 newlib/libc/machine/powerpc/atosfix32.c      |   8 +-
 newlib/libc/machine/powerpc/atosfix64.c      |   8 +-
 newlib/libc/machine/powerpc/atoufix16.c      |   8 +-
 newlib/libc/machine/powerpc/atoufix32.c      |   8 +-
 newlib/libc/machine/powerpc/atoufix64.c      |   8 +-
 newlib/libc/machine/powerpc/machine/malloc.h |  12 +-
 newlib/libc/machine/powerpc/machine/stdlib.h |  78 ++--
 newlib/libc/machine/powerpc/strtosfix16.c    |   8 +-
 newlib/libc/machine/powerpc/strtosfix32.c    |   8 +-
 newlib/libc/machine/powerpc/strtosfix64.c    |   8 +-
 newlib/libc/machine/powerpc/strtoufix16.c    |   8 +-
 newlib/libc/machine/powerpc/strtoufix32.c    |   8 +-
 newlib/libc/machine/powerpc/strtoufix64.c    |   8 +-
 newlib/libc/machine/powerpc/ufix64toa.c      |  17 +-
 newlib/libc/machine/powerpc/vec_calloc.c     |   5 +-
 newlib/libc/machine/powerpc/vec_free.c       |   3 +-
 newlib/libc/machine/powerpc/vec_malloc.c     |   5 +-
 newlib/libc/machine/powerpc/vec_realloc.c    |   5 +-
 newlib/libc/machine/powerpc/vfprintf.c       |  42 +-
 newlib/libc/machine/powerpc/vfscanf.c        |  30 +-
 newlib/libc/machine/spu/assert.c             |  12 +-
 newlib/libc/machine/spu/c99ppe.h             |   4 +-
 newlib/libc/machine/spu/clearerr.c           |   5 +-
 newlib/libc/machine/spu/creat.c              |   3 +-
 newlib/libc/machine/spu/fclose.c             |   3 +-
 newlib/libc/machine/spu/fdopen.c             |   5 +-
 newlib/libc/machine/spu/feof.c               |   3 +-
 newlib/libc/machine/spu/ferror.c             |   3 +-
 newlib/libc/machine/spu/fflush.c             |   3 +-
 newlib/libc/machine/spu/fgetc.c              |   3 +-
 newlib/libc/machine/spu/fgetpos.c            |   3 +-
 newlib/libc/machine/spu/fgets.c              |   5 +-
 newlib/libc/machine/spu/fileno.c             |   3 +-
 newlib/libc/machine/spu/fopen.c              |   9 +-
 newlib/libc/machine/spu/fputs.c              |   5 +-
 newlib/libc/machine/spu/fread.c              |   7 +-
 newlib/libc/machine/spu/freopen.c            |   9 +-
 newlib/libc/machine/spu/fseek.c              |   5 +-
 newlib/libc/machine/spu/fsetpos.c            |   7 +-
 newlib/libc/machine/spu/ftell.c              |   3 +-
 newlib/libc/machine/spu/fwrite.c             |   9 +-
 newlib/libc/machine/spu/impure.c             |   2 +-
 newlib/libc/machine/spu/perror.c             |   5 +-
 newlib/libc/machine/spu/puts.c               |   3 +-
 newlib/libc/machine/spu/remove.c             |   2 +-
 newlib/libc/machine/spu/rename.c             |   8 +-
 newlib/libc/machine/spu/rewind.c             |   3 +-
 newlib/libc/machine/spu/setbuf.c             |   3 +-
 newlib/libc/machine/spu/setvbuf.c            |   7 +-
 newlib/libc/machine/spu/stdio.c              |  17 +-
 newlib/libc/machine/spu/sys/errno.h          |   2 +-
 newlib/libc/machine/spu/tmpfile.c            |   2 +-
 newlib/libc/machine/spu/tmpnam.c             |   3 +-
 newlib/libc/machine/spu/vfprintf.c           |   9 +-
 newlib/libc/machine/spu/vfscanf.c            |   9 +-
 newlib/libc/machine/spu/vprintf.c            |   9 +-
 newlib/libc/machine/spu/vscanf.c             |   7 +-
 newlib/libc/machine/spu/vsnprintf.c          |  13 +-
 newlib/libc/machine/spu/vsprintf.c           |   9 +-
 newlib/libc/machine/spu/vsscanf.c            |  13 +-
 newlib/libc/machine/xscale/strlen.c          |   2 +-
 newlib/libc/machine/xstormy16/mallocr.c      |  10 +-
 newlib/libc/misc/__dprintf.c                 |  24 +-
 newlib/libc/misc/unctrl.c                    |   4 +-
 newlib/libc/posix/_isatty.c                  |   2 +-
 newlib/libc/posix/closedir.c                 |   3 +-
 newlib/libc/posix/creat.c                    |   3 +-
 newlib/libc/posix/execl.c                    |  23 +-
 newlib/libc/posix/execle.c                   |  27 +-
 newlib/libc/posix/execlp.c                   |  23 +-
 newlib/libc/posix/execv.c                    |   5 +-
 newlib/libc/posix/execve.c                   |   5 +-
 newlib/libc/posix/execvp.c                   |  10 +-
 newlib/libc/posix/isatty.c                   |   2 +-
 newlib/libc/posix/opendir.c                  |   3 +-
 newlib/libc/posix/popen.c                    |   6 +-
 newlib/libc/posix/posix_spawn.c              | 109 ++---
 newlib/libc/posix/readdir.c                  |   3 +-
 newlib/libc/posix/readdir_r.c                |   5 +-
 newlib/libc/posix/rewinddir.c                |   3 +-
 newlib/libc/posix/scandir.c                  |  10 +-
 newlib/libc/posix/seekdir.c                  |   3 +-
 newlib/libc/posix/telldir.c                  |   9 +-
 newlib/libc/reent/execr.c                    |  15 +-
 newlib/libc/reent/fcntlr.c                   |   7 +-
 newlib/libc/reent/fstat64r.c                 |   5 +-
 newlib/libc/reent/getreent.c                 |   2 +-
 newlib/libc/reent/gettimeofdayr.c            |   5 +-
 newlib/libc/reent/impure.c                   |   2 +-
 newlib/libc/reent/linkr.c                    |   7 +-
 newlib/libc/reent/lseek64r.c                 |   7 +-
 newlib/libc/reent/lseekr.c                   |   7 +-
 newlib/libc/reent/mkdirr.c                   |   5 +-
 newlib/libc/reent/open64r.c                  |   2 +-
 newlib/libc/reent/openr.c                    |   7 +-
 newlib/libc/reent/readr.c                    |   7 +-
 newlib/libc/reent/reent.c                    |   6 +-
 newlib/libc/reent/renamer.c                  |   7 +-
 newlib/libc/reent/sbrkr.c                    |   3 +-
 newlib/libc/reent/signalr.c                  |   8 +-
 newlib/libc/reent/signgam.c                  |   2 +-
 newlib/libc/reent/stat64r.c                  |   5 +-
 newlib/libc/reent/statr.c                    |   5 +-
 newlib/libc/reent/timesr.c                   |   3 +-
 newlib/libc/reent/unlinkr.c                  |   5 +-
 newlib/libc/reent/writer.c                   |   7 +-
 newlib/libc/search/bsearch.c                 |  17 +-
 newlib/libc/search/hash.c                    |   9 +-
 newlib/libc/search/hcreate.c                 |   7 +-
 newlib/libc/search/qsort.c                   |  45 +-
 newlib/libc/search/tdelete.c                 |   5 +-
 newlib/libc/search/tdestroy.c                |   3 +-
 newlib/libc/search/tfind.c                   |   5 +-
 newlib/libc/search/tsearch.c                 |   5 +-
 newlib/libc/search/twalk.c                   |   3 +-
 newlib/libc/signal/psignal.c                 |   7 +-
 newlib/libc/signal/raise.c                   |   6 +-
 newlib/libc/signal/signal.c                  |  24 +-
 newlib/libc/stdio/asiprintf.c                |  12 +-
 newlib/libc/stdio/asniprintf.c               |  16 +-
 newlib/libc/stdio/asnprintf.c                |  24 +-
 newlib/libc/stdio/asprintf.c                 |  20 +-
 newlib/libc/stdio/clearerr.c                 |   5 +-
 newlib/libc/stdio/clearerr_u.c               |   5 +-
 newlib/libc/stdio/diprintf.c                 |  12 +-
 newlib/libc/stdio/dprintf.c                  |  20 +-
 newlib/libc/stdio/fclose.c                   |   6 +-
 newlib/libc/stdio/fcloseall.c                |   5 +-
 newlib/libc/stdio/fdopen.c                   |  14 +-
 newlib/libc/stdio/feof.c                     |   3 +-
 newlib/libc/stdio/feof_u.c                   |   3 +-
 newlib/libc/stdio/ferror.c                   |   3 +-
 newlib/libc/stdio/ferror_u.c                 |   3 +-
 newlib/libc/stdio/fflush.c                   |  12 +-
 newlib/libc/stdio/fgetc.c                    |   6 +-
 newlib/libc/stdio/fgetc_u.c                  |   6 +-
 newlib/libc/stdio/fgetpos.c                  |   8 +-
 newlib/libc/stdio/fgets.c                    |  18 +-
 newlib/libc/stdio/fgetwc.c                   |   9 +-
 newlib/libc/stdio/fgetwc_u.c                 |   6 +-
 newlib/libc/stdio/fgetws.c                   |  12 +-
 newlib/libc/stdio/fileno.c                   |   3 +-
 newlib/libc/stdio/fileno_u.c                 |   3 +-
 newlib/libc/stdio/findfp.c                   |  65 ++-
 newlib/libc/stdio/fiprintf.c                 |  12 +-
 newlib/libc/stdio/fiscanf.c                  |  31 +-
 newlib/libc/stdio/flags.c                    |   5 +-
 newlib/libc/stdio/fmemopen.c                 |  43 +-
 newlib/libc/stdio/fopen.c                    |  14 +-
 newlib/libc/stdio/fopencookie.c              |  43 +-
 newlib/libc/stdio/fprintf.c                  |  20 +-
 newlib/libc/stdio/fpurge.c                   |   9 +-
 newlib/libc/stdio/fputc.c                    |   8 +-
 newlib/libc/stdio/fputc_u.c                  |   8 +-
 newlib/libc/stdio/fputs.c                    |  10 +-
 newlib/libc/stdio/fputwc.c                   |  13 +-
 newlib/libc/stdio/fputwc_u.c                 |   8 +-
 newlib/libc/stdio/fputws.c                   |   8 +-
 newlib/libc/stdio/fread.c                    |  31 +-
 newlib/libc/stdio/freopen.c                  |  14 +-
 newlib/libc/stdio/fscanf.c                   |  39 +-
 newlib/libc/stdio/fseek.c                    |  12 +-
 newlib/libc/stdio/fseeko.c                   |  14 +-
 newlib/libc/stdio/fsetlocking.c              |   3 +-
 newlib/libc/stdio/fsetpos.c                  |  12 +-
 newlib/libc/stdio/ftell.c                    |   6 +-
 newlib/libc/stdio/ftello.c                   |   6 +-
 newlib/libc/stdio/funopen.c                  |  51 +--
 newlib/libc/stdio/fvwrite.c                  |  11 +-
 newlib/libc/stdio/fvwrite.h                  |   6 +-
 newlib/libc/stdio/fwalk.c                    |   6 +-
 newlib/libc/stdio/fwide.c                    |   8 +-
 newlib/libc/stdio/fwprintf.c                 |  12 +-
 newlib/libc/stdio/fwrite.c                   |  18 +-
 newlib/libc/stdio/fwscanf.c                  |   4 +-
 newlib/libc/stdio/getc.c                     |   6 +-
 newlib/libc/stdio/getc_u.c                   |   6 +-
 newlib/libc/stdio/getchar.c                  |   5 +-
 newlib/libc/stdio/getchar_u.c                |   5 +-
 newlib/libc/stdio/getdelim.c                 |   7 +-
 newlib/libc/stdio/getline.c                  |   7 +-
 newlib/libc/stdio/gets.c                     |   6 +-
 newlib/libc/stdio/getw.c                     |   3 +-
 newlib/libc/stdio/getwc.c                    |   6 +-
 newlib/libc/stdio/getwc_u.c                  |   6 +-
 newlib/libc/stdio/getwchar.c                 |   5 +-
 newlib/libc/stdio/getwchar_u.c               |   5 +-
 newlib/libc/stdio/iprintf.c                  |   8 +-
 newlib/libc/stdio/iscanf.c                   |  29 +-
 newlib/libc/stdio/local.h                    | 112 ++---
 newlib/libc/stdio/makebuf.c                  |  14 +-
 newlib/libc/stdio/mktemp.c                   |  57 +--
 newlib/libc/stdio/nano-vfprintf.c            |  63 ++-
 newlib/libc/stdio/nano-vfprintf_float.c      |   2 +-
 newlib/libc/stdio/nano-vfprintf_i.c          |   4 +-
 newlib/libc/stdio/nano-vfprintf_local.h      |  12 +-
 newlib/libc/stdio/nano-vfscanf.c             |  54 +--
 newlib/libc/stdio/nano-vfscanf_i.c           |   2 +-
 newlib/libc/stdio/open_memstream.c           |  47 +-
 newlib/libc/stdio/perror.c                   |  12 +-
 newlib/libc/stdio/printf.c                   |  16 +-
 newlib/libc/stdio/putc.c                     |   8 +-
 newlib/libc/stdio/putc_u.c                   |   8 +-
 newlib/libc/stdio/putchar.c                  |   6 +-
 newlib/libc/stdio/putchar_u.c                |   6 +-
 newlib/libc/stdio/puts.c                     |   8 +-
 newlib/libc/stdio/putw.c                     |   5 +-
 newlib/libc/stdio/putwc.c                    |   8 +-
 newlib/libc/stdio/putwc_u.c                  |   8 +-
 newlib/libc/stdio/putwchar.c                 |   6 +-
 newlib/libc/stdio/putwchar_u.c               |   6 +-
 newlib/libc/stdio/refill.c                   |   8 +-
 newlib/libc/stdio/remove.c                   |   8 +-
 newlib/libc/stdio/rename.c                   |   5 +-
 newlib/libc/stdio/rewind.c                   |  12 +-
 newlib/libc/stdio/rget.c                     |   6 +-
 newlib/libc/stdio/scanf.c                    |  37 +-
 newlib/libc/stdio/sccl.c                     |   3 +-
 newlib/libc/stdio/setbuf.c                   |   7 +-
 newlib/libc/stdio/setbuffer.c                |   9 +-
 newlib/libc/stdio/setlinebuf.c               |   3 +-
 newlib/libc/stdio/setvbuf.c                  |   9 +-
 newlib/libc/stdio/siprintf.c                 |  39 +-
 newlib/libc/stdio/siscanf.c                  |  41 +-
 newlib/libc/stdio/sniprintf.c                |  45 +-
 newlib/libc/stdio/snprintf.c                 |  53 +--
 newlib/libc/stdio/sprintf.c                  |  47 +-
 newlib/libc/stdio/sscanf.c                   |  49 +-
 newlib/libc/stdio/stdio.c                    |  34 +-
 newlib/libc/stdio/stdio_ext.c                |  21 +-
 newlib/libc/stdio/swprintf.c                 |  16 +-
 newlib/libc/stdio/swscanf.c                  |   4 +-
 newlib/libc/stdio/tmpfile.c                  |   7 +-
 newlib/libc/stdio/tmpnam.c                   |  31 +-
 newlib/libc/stdio/ungetc.c                   |  15 +-
 newlib/libc/stdio/ungetwc.c                  |   8 +-
 newlib/libc/stdio/vasiprintf.c               |  12 +-
 newlib/libc/stdio/vasniprintf.c              |  16 +-
 newlib/libc/stdio/vasnprintf.c               |  24 +-
 newlib/libc/stdio/vasprintf.c                |  20 +-
 newlib/libc/stdio/vdiprintf.c                |  12 +-
 newlib/libc/stdio/vdprintf.c                 |  20 +-
 newlib/libc/stdio/vfprintf.c                 | 108 ++---
 newlib/libc/stdio/vfscanf.c                  |  55 +--
 newlib/libc/stdio/vfwprintf.c                |  66 ++-
 newlib/libc/stdio/vfwscanf.c                 |  46 +-
 newlib/libc/stdio/viprintf.c                 |  12 +-
 newlib/libc/stdio/viscanf.c                  |  12 +-
 newlib/libc/stdio/vprintf.c                  |  18 +-
 newlib/libc/stdio/vscanf.c                   |  18 +-
 newlib/libc/stdio/vsiprintf.c                |  12 +-
 newlib/libc/stdio/vsiscanf.c                 |  16 +-
 newlib/libc/stdio/vsniprintf.c               |  16 +-
 newlib/libc/stdio/vsnprintf.c                |  24 +-
 newlib/libc/stdio/vsprintf.c                 |  20 +-
 newlib/libc/stdio/vsscanf.c                  |  24 +-
 newlib/libc/stdio/vswprintf.c                |  16 +-
 newlib/libc/stdio/vswscanf.c                 |   8 +-
 newlib/libc/stdio/vwprintf.c                 |   8 +-
 newlib/libc/stdio/vwscanf.c                  |   8 +-
 newlib/libc/stdio/wbuf.c                     |   8 +-
 newlib/libc/stdio/wprintf.c                  |   8 +-
 newlib/libc/stdio/wscanf.c                   |   4 +-
 newlib/libc/stdio/wsetup.c                   |   3 +-
 newlib/libc/stdio64/fdopen64.c               |  14 +-
 newlib/libc/stdio64/fgetpos64.c              |   8 +-
 newlib/libc/stdio64/fopen64.c                |  14 +-
 newlib/libc/stdio64/freopen64.c              |  14 +-
 newlib/libc/stdio64/fseeko64.c               |  14 +-
 newlib/libc/stdio64/fsetpos64.c              |  12 +-
 newlib/libc/stdio64/ftello64.c               |   6 +-
 newlib/libc/stdio64/stdio64.c                |  14 +-
 newlib/libc/stdio64/tmpfile64.c              |   7 +-
 newlib/libc/stdlib/_Exit.c                   |   3 +-
 newlib/libc/stdlib/__adjust.c                |   7 +-
 newlib/libc/stdlib/__atexit.c                |   8 +-
 newlib/libc/stdlib/__call_atexit.c           |   7 +-
 newlib/libc/stdlib/__exp10.c                 |   5 +-
 newlib/libc/stdlib/__ten_mu.c                |   3 +-
 newlib/libc/stdlib/a64l.c                    |   3 +-
 newlib/libc/stdlib/abort.c                   |   4 +-
 newlib/libc/stdlib/abs.c                     |   2 +-
 newlib/libc/stdlib/assert.c                  |  12 +-
 newlib/libc/stdlib/atexit.c                  |   4 +-
 newlib/libc/stdlib/atexit.h                  |   4 +-
 newlib/libc/stdlib/atof.c                    |   3 +-
 newlib/libc/stdlib/atoff.c                   |   3 +-
 newlib/libc/stdlib/atoi.c                    |   8 +-
 newlib/libc/stdlib/atol.c                    |   4 +-
 newlib/libc/stdlib/atoll.c                   |   8 +-
 newlib/libc/stdlib/calloc.c                  |   5 +-
 newlib/libc/stdlib/cxa_atexit.c              |   8 +-
 newlib/libc/stdlib/cxa_finalize.c            |   3 +-
 newlib/libc/stdlib/div.c                     |   3 +-
 newlib/libc/stdlib/drand48.c                 |   5 +-
 newlib/libc/stdlib/dtoa.c                    |  18 +-
 newlib/libc/stdlib/dtoastub.c                |  12 +-
 newlib/libc/stdlib/ecvtbuf.c                 |  66 ++-
 newlib/libc/stdlib/efgcvt.c                  |  38 +-
 newlib/libc/stdlib/erand48.c                 |   6 +-
 newlib/libc/stdlib/exit.c                    |   5 +-
 newlib/libc/stdlib/gdtoa-gethex.c            |  15 +-
 newlib/libc/stdlib/gdtoa-hexnan.c            |  19 +-
 newlib/libc/stdlib/getenv.c                  |   6 +-
 newlib/libc/stdlib/getenv_r.c                |  12 +-
 newlib/libc/stdlib/itoa.c                    |  10 +-
 newlib/libc/stdlib/jrand48.c                 |   6 +-
 newlib/libc/stdlib/l64a.c                    |   6 +-
 newlib/libc/stdlib/labs.c                    |   3 +-
 newlib/libc/stdlib/lcong48.c                 |  10 +-
 newlib/libc/stdlib/ldiv.c                    |   3 +-
 newlib/libc/stdlib/ldtoa.c                   | 108 ++---
 newlib/libc/stdlib/llabs.c                   |   3 +-
 newlib/libc/stdlib/lldiv.c                   |   3 +-
 newlib/libc/stdlib/local.h                   |   2 +-
 newlib/libc/stdlib/lrand48.c                 |   5 +-
 newlib/libc/stdlib/malign.c                  |   5 +-
 newlib/libc/stdlib/malloc.c                  |   8 +-
 newlib/libc/stdlib/mbctype.h                 |   8 +-
 newlib/libc/stdlib/mblen.c                   |   3 +-
 newlib/libc/stdlib/mblen_r.c                 |   7 +-
 newlib/libc/stdlib/mbrtowc.c                 |  16 +-
 newlib/libc/stdlib/mbsnrtowcs.c              |  20 +-
 newlib/libc/stdlib/mbsrtowcs.c               |  16 +-
 newlib/libc/stdlib/mbstowcs.c                |   5 +-
 newlib/libc/stdlib/mbstowcs_r.c              |   9 +-
 newlib/libc/stdlib/mbtowc.c                  |   5 +-
 newlib/libc/stdlib/mbtowc_r.c                |  54 +--
 newlib/libc/stdlib/mprec.c                   |  78 ++--
 newlib/libc/stdlib/mprec.h                   |  54 +--
 newlib/libc/stdlib/mrand48.c                 |   5 +-
 newlib/libc/stdlib/msize.c                   |   3 +-
 newlib/libc/stdlib/mstats.c                  |  13 +-
 newlib/libc/stdlib/mtrim.c                   |   3 +-
 newlib/libc/stdlib/nrand48.c                 |   6 +-
 newlib/libc/stdlib/on_exit.c                 |   6 +-
 newlib/libc/stdlib/putenv.c                  |   3 +-
 newlib/libc/stdlib/putenv_r.c                |   3 +-
 newlib/libc/stdlib/rand.c                    |   4 +-
 newlib/libc/stdlib/rand48.c                  |   3 +-
 newlib/libc/stdlib/rand48.h                  |   2 +-
 newlib/libc/stdlib/rand_r.c                  |   2 +-
 newlib/libc/stdlib/random.c                  |   4 +-
 newlib/libc/stdlib/realloc.c                 |   5 +-
 newlib/libc/stdlib/reallocf.c                |  12 +-
 newlib/libc/stdlib/rpmatch.c                 |   3 +-
 newlib/libc/stdlib/seed48.c                  |   6 +-
 newlib/libc/stdlib/setenv.c                  |  10 +-
 newlib/libc/stdlib/setenv_r.c                |  14 +-
 newlib/libc/stdlib/srand48.c                 |  10 +-
 newlib/libc/stdlib/std.h                     |   6 -
 newlib/libc/stdlib/strtod.c                  |  29 +-
 newlib/libc/stdlib/strtol.c                  |  12 +-
 newlib/libc/stdlib/strtoll.c                 |  14 +-
 newlib/libc/stdlib/strtoul.c                 |  12 +-
 newlib/libc/stdlib/strtoull.c                |  12 +-
 newlib/libc/stdlib/system.c                  |  20 +-
 newlib/libc/stdlib/utoa.c                    |  10 +-
 newlib/libc/stdlib/valloc.c                  |  10 +-
 newlib/libc/stdlib/wcrtomb.c                 |  12 +-
 newlib/libc/stdlib/wcsnrtombs.c              |  20 +-
 newlib/libc/stdlib/wcsrtombs.c               |  16 +-
 newlib/libc/stdlib/wcstod.c                  |  16 +-
 newlib/libc/stdlib/wcstol.c                  |  12 +-
 newlib/libc/stdlib/wcstoll.c                 |  12 +-
 newlib/libc/stdlib/wcstombs.c                |   5 +-
 newlib/libc/stdlib/wcstombs_r.c              |   9 +-
 newlib/libc/stdlib/wcstoul.c                 |  12 +-
 newlib/libc/stdlib/wcstoull.c                |  12 +-
 newlib/libc/stdlib/wctomb.c                  |   3 +-
 newlib/libc/stdlib/wctomb_r.c                |  42 +-
 newlib/libc/string/bcmp.c                    |   5 +-
 newlib/libc/string/bcopy.c                   |   5 +-
 newlib/libc/string/gnu_basename.c            |   3 +-
 newlib/libc/string/index.c                   |   3 +-
 newlib/libc/string/local.h                   |   2 +-
 newlib/libc/string/memccpy.c                 |  17 +-
 newlib/libc/string/memchr.c                  |   9 +-
 newlib/libc/string/memcmp.c                  |   5 +-
 newlib/libc/string/memcpy.c                  |  13 +-
 newlib/libc/string/memmem.c                  |   7 +-
 newlib/libc/string/memmove.c                 |  13 +-
 newlib/libc/string/mempcpy.c                 |  11 +-
 newlib/libc/string/memrchr.c                 |   9 +-
 newlib/libc/string/memset.c                  |   7 +-
 newlib/libc/string/rawmemchr.c               |   7 +-
 newlib/libc/string/rindex.c                  |   3 +-
 newlib/libc/string/stpcpy.c                  |   7 +-
 newlib/libc/string/stpncpy.c                 |   7 +-
 newlib/libc/string/strcasecmp.c              |   9 +-
 newlib/libc/string/strcasestr.c              |   5 +-
 newlib/libc/string/strcat.c                  |   5 +-
 newlib/libc/string/strchr.c                  |   5 +-
 newlib/libc/string/strchrnul.c               |   3 +-
 newlib/libc/string/strcmp.c                  |   5 +-
 newlib/libc/string/strcoll.c                 |   5 +-
 newlib/libc/string/strcpy.c                  |   9 +-
 newlib/libc/string/strcspn.c                 |   9 +-
 newlib/libc/string/strdup.c                  |   2 +-
 newlib/libc/string/strdup_r.c                |   5 +-
 newlib/libc/string/strerror.c                |  12 +-
 newlib/libc/string/strerror_r.c              |   5 +-
 newlib/libc/string/strlcat.c                 |   5 +-
 newlib/libc/string/strlcpy.c                 |   5 +-
 newlib/libc/string/strlen.c                  |   5 +-
 newlib/libc/string/strlwr.c                  |   3 +-
 newlib/libc/string/strncasecmp.c             |   9 +-
 newlib/libc/string/strncat.c                 |   5 +-
 newlib/libc/string/strncmp.c                 |   5 +-
 newlib/libc/string/strncpy.c                 |  11 +-
 newlib/libc/string/strndup.c                 |   3 +-
 newlib/libc/string/strndup_r.c               |   7 +-
 newlib/libc/string/strnlen.c                 |   5 +-
 newlib/libc/string/strpbrk.c                 |   7 +-
 newlib/libc/string/strrchr.c                 |   5 +-
 newlib/libc/string/strsep.c                  |   3 +-
 newlib/libc/string/strsignal.c               |   3 +-
 newlib/libc/string/strspn.c                  |   9 +-
 newlib/libc/string/strstr.c                  |   5 +-
 newlib/libc/string/strtok.c                  |   3 +-
 newlib/libc/string/strtok_r.c                |  12 +-
 newlib/libc/string/strupr.c                  |   3 +-
 newlib/libc/string/strxfrm.c                 |   5 +-
 newlib/libc/string/swab.c                    |   5 +-
 newlib/libc/string/u_strerr.c                |  11 +-
 newlib/libc/string/wcpcpy.c                  |   5 +-
 newlib/libc/string/wcpncpy.c                 |   5 +-
 newlib/libc/string/wcscasecmp.c              |   5 +-
 newlib/libc/string/wcscat.c                  |   7 +-
 newlib/libc/string/wcschr.c                  |   5 +-
 newlib/libc/string/wcscmp.c                  |   5 +-
 newlib/libc/string/wcscoll.c                 |   5 +-
 newlib/libc/string/wcscpy.c                  |   7 +-
 newlib/libc/string/wcscspn.c                 |   9 +-
 newlib/libc/string/wcslcat.c                 |   7 +-
 newlib/libc/string/wcslcpy.c                 |   7 +-
 newlib/libc/string/wcslen.c                  |   5 +-
 newlib/libc/string/wcsncasecmp.c             |   5 +-
 newlib/libc/string/wcsncat.c                 |   7 +-
 newlib/libc/string/wcsncmp.c                 |   5 +-
 newlib/libc/string/wcsncpy.c                 |   5 +-
 newlib/libc/string/wcsnlen.c                 |   5 +-
 newlib/libc/string/wcspbrk.c                 |   9 +-
 newlib/libc/string/wcsrchr.c                 |   5 +-
 newlib/libc/string/wcsspn.c                  |   9 +-
 newlib/libc/string/wcsstr.c                  |  11 +-
 newlib/libc/string/wcstok.c                  |   5 +-
 newlib/libc/string/wcswidth.c                |   3 +-
 newlib/libc/string/wcsxfrm.c                 |   5 +-
 newlib/libc/string/wcwidth.c                 |   6 +-
 newlib/libc/string/wmemchr.c                 |   5 +-
 newlib/libc/string/wmemcmp.c                 |   5 +-
 newlib/libc/string/wmemcpy.c                 |   5 +-
 newlib/libc/string/wmemmove.c                |   5 +-
 newlib/libc/string/wmempcpy.c                |   5 +-
 newlib/libc/string/wmemset.c                 |   5 +-
 newlib/libc/string/xpg_strerror_r.c          |   5 +-
 newlib/libc/sys/a29khif/getpid.c             |   2 +-
 newlib/libc/sys/a29khif/kill.c               |   3 +-
 newlib/libc/sys/arm/syscalls.c               |  64 +--
 newlib/libc/sys/h8300hms/misc.c              |   8 +-
 newlib/libc/sys/h8500hms/misc.c              |   8 +-
 newlib/libc/sys/linux/ctermid.c              |   3 +-
 newlib/libc/sys/linux/getlogin.c             |   2 +-
 newlib/libc/sys/linux/getpwent.c             |   9 +-
 newlib/libc/sys/linux/include/setjmp.h       |   8 +-
 newlib/libc/sys/linux/include/time.h         |  68 ++-
 newlib/libc/sys/linux/pread.c                |  16 +-
 newlib/libc/sys/linux/pread64.c              |   7 +-
 newlib/libc/sys/linux/pwrite.c               |  16 +-
 newlib/libc/sys/linux/pwrite64.c             |   7 +-
 newlib/libc/sys/linux/sys/errno.h            |   4 +-
 newlib/libc/sys/linux/sys/fcntl.h            |  10 +-
 newlib/libc/sys/linux/sys/signal.h           |  20 +-
 newlib/libc/sys/linux/sys/stat.h             |  18 +-
 newlib/libc/sys/linux/sys/stdio.h            |   2 +-
 newlib/libc/sys/linux/sys/string.h           |   2 +-
 newlib/libc/sys/linux/sys/time.h             |  12 +-
 newlib/libc/sys/linux/sys/unistd.h           | 178 +++----
 newlib/libc/sys/linux/sys/utime.h            |   2 +-
 newlib/libc/sys/phoenix/sys/errno.h          |   4 +-
 newlib/libc/sys/rtems/crt0.c                 |  10 +-
 newlib/libc/sys/sparc64/ieee.c               |  20 +-
 newlib/libc/sys/sparc64/sys/fcntl.h          |   6 +-
 newlib/libc/sys/sparc64/sys/stat.h           |  12 +-
 newlib/libc/sys/sun4/ieee.c                  |  20 +-
 newlib/libc/sys/sysnec810/misc.c             |   3 +-
 newlib/libc/sys/sysvi386/fpx.c               |  15 +-
 newlib/libc/sys/sysvnecv70/fpx.c             |  15 +-
 newlib/libc/syscalls/sysclose.c              |   3 +-
 newlib/libc/syscalls/sysexecve.c             |   7 +-
 newlib/libc/syscalls/sysfcntl.c              |   5 +-
 newlib/libc/syscalls/sysfork.c               |   2 +-
 newlib/libc/syscalls/sysfstat.c              |   3 +-
 newlib/libc/syscalls/sysgetpid.c             |   2 +-
 newlib/libc/syscalls/sysgettod.c             |   3 +-
 newlib/libc/syscalls/sysisatty.c             |   3 +-
 newlib/libc/syscalls/syskill.c               |   3 +-
 newlib/libc/syscalls/syslink.c               |   5 +-
 newlib/libc/syscalls/syslseek.c              |   5 +-
 newlib/libc/syscalls/sysopen.c               |  18 +-
 newlib/libc/syscalls/sysread.c               |   5 +-
 newlib/libc/syscalls/syssbrk.c               |   3 +-
 newlib/libc/syscalls/sysstat.c               |   3 +-
 newlib/libc/syscalls/systimes.c              |   3 +-
 newlib/libc/syscalls/sysunlink.c             |   3 +-
 newlib/libc/syscalls/syswait.c               |   3 +-
 newlib/libc/syscalls/syswrite.c              |   5 +-
 newlib/libc/time/asctime.c                   |   3 +-
 newlib/libc/time/asctime_r.c                 |   7 +-
 newlib/libc/time/ctime.c                     |   3 +-
 newlib/libc/time/ctime_r.c                   |   3 +-
 newlib/libc/time/difftime.c                  |   3 +-
 newlib/libc/time/gmtime.c                    |   3 +-
 newlib/libc/time/gmtime_r.c                  |   5 +-
 newlib/libc/time/lcltime.c                   |   3 +-
 newlib/libc/time/lcltime_r.c                 |   7 +-
 newlib/libc/time/local.h                     |  12 +-
 newlib/libc/time/mktime.c                    |  10 +-
 newlib/libc/time/month_lengths.c             |   2 +-
 newlib/libc/time/strftime.c                  |  14 +-
 newlib/libc/time/strptime.c                  |   2 +-
 newlib/libc/time/time.c                      |   3 +-
 newlib/libc/time/tzcalc_limits.c             |   9 +-
 newlib/libc/time/tzlock.c                    |   8 +-
 newlib/libc/time/tzset.c                     |   8 +-
 newlib/libc/time/tzset_r.c                   |  10 +-
 newlib/libc/unix/basename.c                  |   3 +-
 newlib/libc/unix/dirname.c                   |   3 +-
 newlib/libc/unix/getut.c                     |   2 +-
 newlib/libc/unix/pread.c                     |  16 +-
 newlib/libc/unix/pwrite.c                    |  16 +-
 newlib/libc/unix/ttyname.c                   |   3 +-
 newlib/libc/unix/ttyname_r.c                 |   5 +-
 newlib/libc/xdr/xdr.c                        | 115 ++---
 newlib/libc/xdr/xdr_array.c                  |  20 +-
 newlib/libc/xdr/xdr_float.c                  |   6 +-
 newlib/libc/xdr/xdr_float_vax.c              |   6 +-
 newlib/libc/xdr/xdr_mem.c                    | 100 ++--
 newlib/libc/xdr/xdr_private.c                |   9 +-
 newlib/libc/xdr/xdr_private.h                |  12 +-
 newlib/libc/xdr/xdr_rec.c                    | 119 ++---
 newlib/libc/xdr/xdr_reference.c              |  14 +-
 newlib/libc/xdr/xdr_sizeof.c                 |  40 +-
 newlib/libc/xdr/xdr_stdio.c                  |  65 ++-
 newlib/libm/common/s_isinf.c                 |   3 +-
 newlib/libm/common/s_isinfd.c                |   3 +-
 newlib/libm/common/s_isnand.c                |   3 +-
 newlib/libm/common/sf_isinf.c                |   6 +-
 newlib/libm/common/sf_isinff.c               |   6 +-
 newlib/libm/common/sf_isnan.c                |   6 +-
 newlib/libm/common/sf_isnanf.c               |   6 +-
 newlib/libm/machine/i386/f_math.h            |   6 +-
 newlib/libm/math/wf_acos.c                   |   5 -
 newlib/libm/mathfp/s_acos.c                  |   3 +-
 newlib/libm/mathfp/s_asin.c                  |   3 +-
 newlib/libm/mathfp/s_asine.c                 |   3 +-
 newlib/libm/mathfp/s_atan.c                  |   3 +-
 newlib/libm/mathfp/s_atan2.c                 |   3 +-
 newlib/libm/mathfp/s_atangent.c              |   7 +-
 newlib/libm/mathfp/s_ceil.c                  |   3 +-
 newlib/libm/mathfp/s_cos.c                   |   3 +-
 newlib/libm/mathfp/s_cosh.c                  |   3 +-
 newlib/libm/mathfp/s_exp.c                   |   3 +-
 newlib/libm/mathfp/s_exp2.c                  |   3 +-
 newlib/libm/mathfp/s_fabs.c                  |   3 +-
 newlib/libm/mathfp/s_floor.c                 |   3 +-
 newlib/libm/mathfp/s_ldexp.c                 |   3 +-
 newlib/libm/mathfp/s_log.c                   |   3 +-
 newlib/libm/mathfp/s_log10.c                 |   3 +-
 newlib/libm/mathfp/s_logarithm.c             |   3 +-
 newlib/libm/mathfp/s_numtest.c               |   3 +-
 newlib/libm/mathfp/s_sin.c                   |   3 +-
 newlib/libm/mathfp/s_sincos.c                |   5 +-
 newlib/libm/mathfp/s_sine.c                  |   3 +-
 newlib/libm/mathfp/s_sineh.c                 |   3 +-
 newlib/libm/mathfp/s_sinf.c                  |   3 +-
 newlib/libm/mathfp/s_sinh.c                  |   3 +-
 newlib/libm/mathfp/s_sqrt.c                  |   3 +-
 newlib/libm/mathfp/s_tan.c                   |   3 +-
 newlib/libm/mathfp/s_tanh.c                  |   3 +-
 newlib/libm/mathfp/sf_acos.c                 |   3 +-
 newlib/libm/mathfp/sf_asin.c                 |   3 +-
 newlib/libm/mathfp/sf_asine.c                |   3 +-
 newlib/libm/mathfp/sf_atan.c                 |   3 +-
 newlib/libm/mathfp/sf_atan2.c                |   3 +-
 newlib/libm/mathfp/sf_atangent.c             |   7 +-
 newlib/libm/mathfp/sf_ceil.c                 |   3 +-
 newlib/libm/mathfp/sf_cos.c                  |   3 +-
 newlib/libm/mathfp/sf_cosh.c                 |   3 +-
 newlib/libm/mathfp/sf_exp.c                  |   3 +-
 newlib/libm/mathfp/sf_exp2.c                 |   3 +-
 newlib/libm/mathfp/sf_fabs.c                 |   3 +-
 newlib/libm/mathfp/sf_floor.c                |   3 +-
 newlib/libm/mathfp/sf_fmod.c                 |   3 +-
 newlib/libm/mathfp/sf_ldexp.c                |   3 +-
 newlib/libm/mathfp/sf_log.c                  |   3 +-
 newlib/libm/mathfp/sf_log10.c                |   3 +-
 newlib/libm/mathfp/sf_logarithm.c            |   3 +-
 newlib/libm/mathfp/sf_numtest.c              |   3 +-
 newlib/libm/mathfp/sf_sin.c                  |   3 +-
 newlib/libm/mathfp/sf_sincos.c               |   5 +-
 newlib/libm/mathfp/sf_sine.c                 |   3 +-
 newlib/libm/mathfp/sf_sineh.c                |   3 +-
 newlib/libm/mathfp/sf_sinh.c                 |   3 +-
 newlib/libm/mathfp/sf_sqrt.c                 |   3 +-
 newlib/libm/mathfp/sf_tan.c                  |   3 +-
 newlib/libm/mathfp/sf_tanh.c                 |   3 +-
 newlib/libm/mathfp/zmath.h                   |  24 +-
 newlib/libm/test/convert.c                   |  46 +-
 newlib/libm/test/dcvt.c                      |  61 +--
 newlib/libm/test/math.c                      |  79 ++--
 newlib/libm/test/math2.c                     |  14 +-
 newlib/libm/test/string.c                    |  14 +-
 newlib/libm/test/test.c                      |  33 +-
 newlib/libm/test/test.h                      |  28 +-
 newlib/libm/test/test_ieee.c                 |  15 +-
 newlib/libm/test/test_is.c                   |  53 +--
 winsup/cygwin/include/attr/xattr.h           |  24 +-
 winsup/cygwin/include/cygwin/stdlib.h        |   4 +-
 winsup/cygwin/include/fcntl.h                |   4 +-
 winsup/cygwin/include/pty.h                  |   8 +-
 winsup/cygwin/include/sys/file.h             |   2 +-
 winsup/cygwin/include/sys/stdio.h            |   4 +-
 winsup/cygwin/include/sys/utime.h            |   2 +-
 winsup/cygwin/libc/strptime.cc               |   2 +-
 921 files changed, 5621 insertions(+), 7547 deletions(-)
 delete mode 100644 newlib/doc/ansidecl.h

--
2.15.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v2 01/17] ansification: remove _AND

Yaakov Selkowitz-2
Signed-off-by: Yaakov Selkowitz <[hidden email]>
---
 libgloss/cr16/fstat.c                     |  2 +-
 libgloss/cr16/isatty.c                    |  2 +-
 libgloss/cr16/kill.c                      |  2 +-
 libgloss/cr16/stat.c                      |  2 +-
 libgloss/crx/fstat.c                      |  2 +-
 libgloss/crx/isatty.c                     |  2 +-
 libgloss/crx/kill.c                       |  2 +-
 libgloss/crx/stat.c                       |  2 +-
 libgloss/frv/fstat.c                      |  2 +-
 libgloss/frv/isatty.c                     |  2 +-
 libgloss/frv/kill.c                       |  2 +-
 libgloss/frv/sim-time.c                   |  2 +-
 libgloss/frv/stat.c                       |  2 +-
 libgloss/fstat.c                          |  2 +-
 libgloss/ft32/fstat.c                     |  2 +-
 libgloss/ft32/isatty.c                    |  2 +-
 libgloss/ft32/kill.c                      |  2 +-
 libgloss/ft32/sim-lseek.S                 |  4 +-
 libgloss/ft32/sim-lseek.c                 |  4 +-
 libgloss/ft32/sim-time.c                  |  2 +-
 libgloss/ft32/stat.c                      |  2 +-
 libgloss/isatty.c                         |  2 +-
 libgloss/kill.c                           |  2 +-
 libgloss/libnosys/chown.c                 |  4 +-
 libgloss/libnosys/execve.c                |  4 +-
 libgloss/libnosys/fstat.c                 |  2 +-
 libgloss/libnosys/gettod.c                |  2 +-
 libgloss/libnosys/kill.c                  |  2 +-
 libgloss/libnosys/link.c                  |  2 +-
 libgloss/libnosys/lseek.c                 |  4 +-
 libgloss/libnosys/open.c                  |  4 +-
 libgloss/libnosys/read.c                  |  4 +-
 libgloss/libnosys/readlink.c              |  4 +-
 libgloss/libnosys/stat.c                  |  2 +-
 libgloss/libnosys/symlink.c               |  2 +-
 libgloss/libnosys/write.c                 |  4 +-
 libgloss/lseek.c                          |  4 +-
 libgloss/mcore/fstat.c                    |  2 +-
 libgloss/mcore/kill.c                     |  2 +-
 libgloss/mcore/lseek.c                    |  4 +-
 libgloss/mcore/open.c                     |  4 +-
 libgloss/mcore/read.c                     |  4 +-
 libgloss/mcore/stat.c                     |  2 +-
 libgloss/mcore/write.c                    |  4 +-
 libgloss/moxie/fstat.c                    |  2 +-
 libgloss/moxie/isatty.c                   |  2 +-
 libgloss/moxie/kill.c                     |  2 +-
 libgloss/moxie/qemu-time.c                |  2 +-
 libgloss/moxie/sim-lseek.S                |  4 +-
 libgloss/moxie/sim-lseek.c                |  4 +-
 libgloss/moxie/sim-time.c                 |  2 +-
 libgloss/moxie/stat.c                     |  2 +-
 libgloss/open.c                           |  4 +-
 libgloss/read.c                           |  4 +-
 libgloss/stat.c                           |  2 +-
 libgloss/tic6x/kill.c                     |  2 +-
 libgloss/write.c                          |  4 +-
 libgloss/xc16x/misc.c                     |  2 +-
 libgloss/xstormy16/fstat.c                |  2 +-
 libgloss/xstormy16/isatty.c               |  2 +-
 libgloss/xstormy16/kill.c                 |  2 +-
 libgloss/xstormy16/lseek.c                |  4 +-
 libgloss/xstormy16/open.c                 |  4 +-
 libgloss/xstormy16/stat.c                 |  2 +-
 newlib/libc/argz/argz_add.c               |  4 +-
 newlib/libc/argz/argz_add_sep.c           |  6 +--
 newlib/libc/argz/argz_append.c            |  6 +--
 newlib/libc/argz/argz_count.c             |  2 +-
 newlib/libc/argz/argz_create.c            |  4 +-
 newlib/libc/argz/argz_create_sep.c        |  6 +--
 newlib/libc/argz/argz_delete.c            |  4 +-
 newlib/libc/argz/argz_extract.c           |  4 +-
 newlib/libc/argz/argz_insert.c            |  6 +--
 newlib/libc/argz/argz_next.c              |  4 +-
 newlib/libc/argz/argz_replace.c           |  8 ++--
 newlib/libc/argz/argz_stringify.c         |  4 +-
 newlib/libc/argz/envz_add.c               |  6 +--
 newlib/libc/argz/envz_entry.c             |  4 +-
 newlib/libc/argz/envz_get.c               |  4 +-
 newlib/libc/argz/envz_merge.c             |  8 ++--
 newlib/libc/argz/envz_remove.c            |  4 +-
 newlib/libc/argz/envz_strip.c             |  2 +-
 newlib/libc/ctype/iswctype.c              |  2 +-
 newlib/libc/ctype/jp2uc.c                 |  2 +-
 newlib/libc/ctype/towctrans.c             |  6 +--
 newlib/libc/ctype/wctrans.c               |  2 +-
 newlib/libc/ctype/wctype.c                |  2 +-
 newlib/libc/iconv/ces/euc.c               | 18 +++----
 newlib/libc/iconv/ces/table-pcs.c         | 18 +++----
 newlib/libc/iconv/ces/table.c             | 26 +++++-----
 newlib/libc/iconv/ces/ucs-2-internal.c    | 10 ++--
 newlib/libc/iconv/ces/ucs-2.c             | 14 +++---
 newlib/libc/iconv/ces/ucs-4-internal.c    | 10 ++--
 newlib/libc/iconv/ces/ucs-4.c             | 14 +++---
 newlib/libc/iconv/ces/us-ascii.c          | 10 ++--
 newlib/libc/iconv/ces/utf-16.c            | 16 +++----
 newlib/libc/iconv/ces/utf-8.c             | 10 ++--
 newlib/libc/iconv/lib/aliasesi.c          | 10 ++--
 newlib/libc/iconv/lib/iconv.c             | 26 +++++-----
 newlib/libc/iconv/lib/iconvnls.c          | 40 ++++++++--------
 newlib/libc/iconv/lib/nullconv.c          | 30 ++++++------
 newlib/libc/iconv/lib/ucsconv.c           | 32 ++++++-------
 newlib/libc/include/_ansi.h               |  2 -
 newlib/libc/locale/locale.c               |  6 +--
 newlib/libc/machine/microblaze/strcmp.c   |  2 +-
 newlib/libc/machine/microblaze/strcpy.c   |  2 +-
 newlib/libc/machine/powerpc/atosfix16.c   |  2 +-
 newlib/libc/machine/powerpc/atosfix32.c   |  2 +-
 newlib/libc/machine/powerpc/atosfix64.c   |  2 +-
 newlib/libc/machine/powerpc/atoufix16.c   |  2 +-
 newlib/libc/machine/powerpc/atoufix32.c   |  2 +-
 newlib/libc/machine/powerpc/atoufix64.c   |  2 +-
 newlib/libc/machine/powerpc/strtosfix16.c |  6 +--
 newlib/libc/machine/powerpc/strtosfix32.c |  6 +--
 newlib/libc/machine/powerpc/strtosfix64.c |  6 +--
 newlib/libc/machine/powerpc/strtoufix16.c |  6 +--
 newlib/libc/machine/powerpc/strtoufix32.c |  6 +--
 newlib/libc/machine/powerpc/strtoufix64.c |  6 +--
 newlib/libc/machine/powerpc/ufix64toa.c   | 12 ++---
 newlib/libc/machine/powerpc/vec_calloc.c  |  2 +-
 newlib/libc/machine/powerpc/vec_realloc.c |  2 +-
 newlib/libc/machine/powerpc/vfprintf.c    | 10 ++--
 newlib/libc/machine/powerpc/vfscanf.c     | 10 ++--
 newlib/libc/machine/spu/assert.c          | 10 ++--
 newlib/libc/machine/spu/creat.c           |  2 +-
 newlib/libc/machine/spu/fdopen.c          |  2 +-
 newlib/libc/machine/spu/fgetpos.c         |  2 +-
 newlib/libc/machine/spu/fgets.c           |  4 +-
 newlib/libc/machine/spu/fopen.c           |  2 +-
 newlib/libc/machine/spu/fputs.c           |  2 +-
 newlib/libc/machine/spu/fread.c           |  6 +--
 newlib/libc/machine/spu/freopen.c         |  4 +-
 newlib/libc/machine/spu/fseek.c           |  4 +-
 newlib/libc/machine/spu/fsetpos.c         |  2 +-
 newlib/libc/machine/spu/fwrite.c          |  6 +--
 newlib/libc/machine/spu/setbuf.c          |  2 +-
 newlib/libc/machine/spu/setvbuf.c         |  6 +--
 newlib/libc/machine/spu/vfprintf.c        |  4 +-
 newlib/libc/machine/spu/vfscanf.c         |  4 +-
 newlib/libc/machine/spu/vprintf.c         |  2 +-
 newlib/libc/machine/spu/vscanf.c          |  2 +-
 newlib/libc/machine/spu/vsnprintf.c       |  6 +--
 newlib/libc/machine/spu/vsprintf.c        |  4 +-
 newlib/libc/machine/spu/vsscanf.c         |  4 +-
 newlib/libc/misc/__dprintf.c              |  8 ++--
 newlib/libc/posix/creat.c                 |  2 +-
 newlib/libc/posix/execl.c                 |  6 +--
 newlib/libc/posix/execle.c                |  6 +--
 newlib/libc/posix/execlp.c                |  6 +--
 newlib/libc/posix/execv.c                 |  2 +-
 newlib/libc/posix/execve.c                |  4 +-
 newlib/libc/posix/execvp.c                |  6 +--
 newlib/libc/posix/popen.c                 |  2 +-
 newlib/libc/posix/posix_spawn.c           | 58 +++++++++++-----------
 newlib/libc/posix/readdir_r.c             |  4 +-
 newlib/libc/posix/scandir.c               |  8 ++--
 newlib/libc/posix/seekdir.c               |  2 +-
 newlib/libc/posix/telldir.c               |  2 +-
 newlib/libc/reent/execr.c                 |  8 ++--
 newlib/libc/reent/fcntlr.c                |  6 +--
 newlib/libc/reent/fstat64r.c              |  4 +-
 newlib/libc/reent/gettimeofdayr.c         |  4 +-
 newlib/libc/reent/linkr.c                 |  4 +-
 newlib/libc/reent/lseek64r.c              |  6 +--
 newlib/libc/reent/lseekr.c                |  6 +--
 newlib/libc/reent/mkdirr.c                |  4 +-
 newlib/libc/reent/openr.c                 |  6 +--
 newlib/libc/reent/readr.c                 |  6 +--
 newlib/libc/reent/reent.c                 |  2 +-
 newlib/libc/reent/renamer.c               |  4 +-
 newlib/libc/reent/sbrkr.c                 |  2 +-
 newlib/libc/reent/signalr.c               |  4 +-
 newlib/libc/reent/stat64r.c               |  4 +-
 newlib/libc/reent/statr.c                 |  4 +-
 newlib/libc/reent/timesr.c                |  2 +-
 newlib/libc/reent/unlinkr.c               |  2 +-
 newlib/libc/reent/writer.c                |  6 +--
 newlib/libc/search/bsearch.c              |  8 ++--
 newlib/libc/search/hash.c                 |  8 ++--
 newlib/libc/search/hcreate.c              |  2 +-
 newlib/libc/search/qsort.c                | 36 +++++++-------
 newlib/libc/search/tdelete.c              |  4 +-
 newlib/libc/search/tdestroy.c             |  2 +-
 newlib/libc/search/tfind.c                |  4 +-
 newlib/libc/search/tsearch.c              |  4 +-
 newlib/libc/search/twalk.c                |  2 +-
 newlib/libc/signal/psignal.c              |  2 +-
 newlib/libc/signal/raise.c                |  2 +-
 newlib/libc/signal/signal.c               | 10 ++--
 newlib/libc/stdio/asiprintf.c             |  6 +--
 newlib/libc/stdio/asniprintf.c            | 10 ++--
 newlib/libc/stdio/asnprintf.c             | 10 ++--
 newlib/libc/stdio/asprintf.c              |  6 +--
 newlib/libc/stdio/diprintf.c              |  6 +--
 newlib/libc/stdio/dprintf.c               |  6 +--
 newlib/libc/stdio/fclose.c                |  2 +-
 newlib/libc/stdio/fdopen.c                |  6 +--
 newlib/libc/stdio/fflush.c                |  6 +--
 newlib/libc/stdio/fgetc.c                 |  2 +-
 newlib/libc/stdio/fgetc_u.c               |  2 +-
 newlib/libc/stdio/fgetpos.c               |  6 +--
 newlib/libc/stdio/fgets.c                 | 10 ++--
 newlib/libc/stdio/fgetwc.c                |  4 +-
 newlib/libc/stdio/fgetwc_u.c              |  2 +-
 newlib/libc/stdio/fgetws.c                | 10 ++--
 newlib/libc/stdio/findfp.c                |  6 +--
 newlib/libc/stdio/fiprintf.c              |  6 +--
 newlib/libc/stdio/flags.c                 |  4 +-
 newlib/libc/stdio/fmemopen.c              | 36 +++++++-------
 newlib/libc/stdio/fopen.c                 |  6 +--
 newlib/libc/stdio/fopencookie.c           | 36 +++++++-------
 newlib/libc/stdio/fprintf.c               |  6 +--
 newlib/libc/stdio/fpurge.c                |  2 +-
 newlib/libc/stdio/fputc.c                 |  6 +--
 newlib/libc/stdio/fputc_u.c               |  6 +--
 newlib/libc/stdio/fputs.c                 |  6 +--
 newlib/libc/stdio/fputwc.c                | 10 ++--
 newlib/libc/stdio/fputwc_u.c              |  6 +--
 newlib/libc/stdio/fputws.c                |  6 +--
 newlib/libc/stdio/fread.c                 | 22 ++++-----
 newlib/libc/stdio/freopen.c               | 10 ++--
 newlib/libc/stdio/fseek.c                 | 10 ++--
 newlib/libc/stdio/fseeko.c                | 10 ++--
 newlib/libc/stdio/fsetlocking.c           |  2 +-
 newlib/libc/stdio/fsetpos.c               |  6 +--
 newlib/libc/stdio/ftell.c                 |  2 +-
 newlib/libc/stdio/ftello.c                |  2 +-
 newlib/libc/stdio/funopen.c               | 44 ++++++++---------
 newlib/libc/stdio/fvwrite.c               |  4 +-
 newlib/libc/stdio/fwalk.c                 |  4 +-
 newlib/libc/stdio/fwide.c                 |  6 +--
 newlib/libc/stdio/fwprintf.c              |  6 +--
 newlib/libc/stdio/fwrite.c                | 14 +++---
 newlib/libc/stdio/getc.c                  |  2 +-
 newlib/libc/stdio/getc_u.c                |  2 +-
 newlib/libc/stdio/getdelim.c              |  6 +--
 newlib/libc/stdio/getline.c               |  4 +-
 newlib/libc/stdio/gets.c                  |  2 +-
 newlib/libc/stdio/getwc.c                 |  2 +-
 newlib/libc/stdio/getwc_u.c               |  2 +-
 newlib/libc/stdio/iprintf.c               |  2 +-
 newlib/libc/stdio/makebuf.c               |  8 ++--
 newlib/libc/stdio/mktemp.c                | 38 +++++++--------
 newlib/libc/stdio/nano-vfprintf.c         | 34 ++++++-------
 newlib/libc/stdio/nano-vfscanf.c          | 26 +++++-----
 newlib/libc/stdio/open_memstream.c        | 38 +++++++--------
 newlib/libc/stdio/perror.c                |  2 +-
 newlib/libc/stdio/printf.c                |  2 +-
 newlib/libc/stdio/putc.c                  |  6 +--
 newlib/libc/stdio/putc_u.c                |  6 +--
 newlib/libc/stdio/putchar.c               |  2 +-
 newlib/libc/stdio/putchar_u.c             |  2 +-
 newlib/libc/stdio/puts.c                  |  2 +-
 newlib/libc/stdio/putw.c                  |  2 +-
 newlib/libc/stdio/putwc.c                 |  6 +--
 newlib/libc/stdio/putwc_u.c               |  6 +--
 newlib/libc/stdio/putwchar.c              |  2 +-
 newlib/libc/stdio/putwchar_u.c            |  2 +-
 newlib/libc/stdio/refill.c                |  2 +-
 newlib/libc/stdio/remove.c                |  2 +-
 newlib/libc/stdio/rename.c                |  2 +-
 newlib/libc/stdio/rewind.c                |  2 +-
 newlib/libc/stdio/rget.c                  |  2 +-
 newlib/libc/stdio/sccl.c                  |  2 +-
 newlib/libc/stdio/setbuf.c                |  2 +-
 newlib/libc/stdio/setbuffer.c             |  4 +-
 newlib/libc/stdio/setvbuf.c               |  6 +--
 newlib/libc/stdio/siprintf.c              |  6 +--
 newlib/libc/stdio/siscanf.c               |  6 +--
 newlib/libc/stdio/sniprintf.c             | 10 ++--
 newlib/libc/stdio/snprintf.c              | 10 ++--
 newlib/libc/stdio/sprintf.c               |  6 +--
 newlib/libc/stdio/sscanf.c                |  6 +--
 newlib/libc/stdio/stdio.c                 | 26 +++++-----
 newlib/libc/stdio/swprintf.c              | 10 ++--
 newlib/libc/stdio/tmpnam.c                | 18 +++----
 newlib/libc/stdio/ungetc.c                |  8 ++--
 newlib/libc/stdio/ungetwc.c               |  6 +--
 newlib/libc/stdio/vasiprintf.c            | 10 ++--
 newlib/libc/stdio/vasniprintf.c           | 14 +++---
 newlib/libc/stdio/vasnprintf.c            | 14 +++---
 newlib/libc/stdio/vasprintf.c             | 10 ++--
 newlib/libc/stdio/vdiprintf.c             | 10 ++--
 newlib/libc/stdio/vdprintf.c              | 10 ++--
 newlib/libc/stdio/vfprintf.c              | 50 +++++++++----------
 newlib/libc/stdio/vfscanf.c               | 34 ++++++-------
 newlib/libc/stdio/vfwprintf.c             | 30 ++++++------
 newlib/libc/stdio/vfwscanf.c              | 26 +++++-----
 newlib/libc/stdio/viprintf.c              |  6 +--
 newlib/libc/stdio/viscanf.c               |  6 +--
 newlib/libc/stdio/vprintf.c               |  6 +--
 newlib/libc/stdio/vscanf.c                |  6 +--
 newlib/libc/stdio/vsiprintf.c             | 10 ++--
 newlib/libc/stdio/vsiscanf.c              | 10 ++--
 newlib/libc/stdio/vsniprintf.c            | 14 +++---
 newlib/libc/stdio/vsnprintf.c             | 14 +++---
 newlib/libc/stdio/vsprintf.c              | 10 ++--
 newlib/libc/stdio/vsscanf.c               | 10 ++--
 newlib/libc/stdio/vswprintf.c             | 14 +++---
 newlib/libc/stdio/vwprintf.c              |  6 +--
 newlib/libc/stdio/wbuf.c                  |  6 +--
 newlib/libc/stdio/wprintf.c               |  2 +-
 newlib/libc/stdio/wsetup.c                |  2 +-
 newlib/libc/stdio64/fdopen64.c            |  6 +--
 newlib/libc/stdio64/fgetpos64.c           |  6 +--
 newlib/libc/stdio64/fopen64.c             |  6 +--
 newlib/libc/stdio64/freopen64.c           | 10 ++--
 newlib/libc/stdio64/fseeko64.c            | 10 ++--
 newlib/libc/stdio64/fsetpos64.c           |  6 +--
 newlib/libc/stdio64/ftello64.c            |  2 +-
 newlib/libc/stdio64/stdio64.c             | 12 ++---
 newlib/libc/stdlib/__adjust.c             |  6 +--
 newlib/libc/stdlib/__atexit.c             |  6 +--
 newlib/libc/stdlib/__call_atexit.c        |  2 +-
 newlib/libc/stdlib/__ten_mu.c             |  2 +-
 newlib/libc/stdlib/assert.c               | 10 ++--
 newlib/libc/stdlib/atoi.c                 |  2 +-
 newlib/libc/stdlib/atol.c                 |  2 +-
 newlib/libc/stdlib/atoll.c                |  2 +-
 newlib/libc/stdlib/calloc.c               |  2 +-
 newlib/libc/stdlib/cxa_atexit.c           |  4 +-
 newlib/libc/stdlib/div.c                  |  2 +-
 newlib/libc/stdlib/dtoa.c                 | 14 +++---
 newlib/libc/stdlib/dtoastub.c             | 10 ++--
 newlib/libc/stdlib/ecvtbuf.c              | 60 +++++++++++------------
 newlib/libc/stdlib/efgcvt.c               | 32 ++++++-------
 newlib/libc/stdlib/erand48.c              |  2 +-
 newlib/libc/stdlib/gdtoa-gethex.c         |  4 +-
 newlib/libc/stdlib/gdtoa-hexnan.c         | 10 ++--
 newlib/libc/stdlib/getenv.c               |  2 +-
 newlib/libc/stdlib/getenv_r.c             |  6 +--
 newlib/libc/stdlib/itoa.c                 |  8 ++--
 newlib/libc/stdlib/jrand48.c              |  2 +-
 newlib/libc/stdlib/l64a.c                 |  2 +-
 newlib/libc/stdlib/lcong48.c              |  2 +-
 newlib/libc/stdlib/ldiv.c                 |  2 +-
 newlib/libc/stdlib/lldiv.c                |  2 +-
 newlib/libc/stdlib/malign.c               |  2 +-
 newlib/libc/stdlib/mblen.c                |  2 +-
 newlib/libc/stdlib/mblen_r.c              |  6 +--
 newlib/libc/stdlib/mbrtowc.c              | 14 +++---
 newlib/libc/stdlib/mbsnrtowcs.c           | 18 +++----
 newlib/libc/stdlib/mbsrtowcs.c            | 14 +++---
 newlib/libc/stdlib/mbstowcs.c             |  4 +-
 newlib/libc/stdlib/mbstowcs_r.c           |  8 ++--
 newlib/libc/stdlib/mbtowc.c               |  4 +-
 newlib/libc/stdlib/mbtowc_r.c             | 48 +++++++++----------
 newlib/libc/stdlib/mprec.c                | 48 +++++++++----------
 newlib/libc/stdlib/mstats.c               |  4 +-
 newlib/libc/stdlib/nrand48.c              |  2 +-
 newlib/libc/stdlib/on_exit.c              |  2 +-
 newlib/libc/stdlib/putenv_r.c             |  2 +-
 newlib/libc/stdlib/rand48.c               |  2 +-
 newlib/libc/stdlib/realloc.c              |  2 +-
 newlib/libc/stdlib/reallocf.c             |  6 +--
 newlib/libc/stdlib/seed48.c               |  2 +-
 newlib/libc/stdlib/setenv.c               |  4 +-
 newlib/libc/stdlib/setenv_r.c             |  8 ++--
 newlib/libc/stdlib/srand48.c              |  2 +-
 newlib/libc/stdlib/strtod.c               | 16 +++----
 newlib/libc/stdlib/strtol.c               | 10 ++--
 newlib/libc/stdlib/strtoll.c              | 10 ++--
 newlib/libc/stdlib/strtoul.c              | 10 ++--
 newlib/libc/stdlib/strtoull.c             | 10 ++--
 newlib/libc/stdlib/system.c               |  8 ++--
 newlib/libc/stdlib/utoa.c                 |  8 ++--
 newlib/libc/stdlib/wcrtomb.c              | 10 ++--
 newlib/libc/stdlib/wcsnrtombs.c           | 18 +++----
 newlib/libc/stdlib/wcsrtombs.c            | 14 +++---
 newlib/libc/stdlib/wcstod.c               | 12 ++---
 newlib/libc/stdlib/wcstol.c               | 10 ++--
 newlib/libc/stdlib/wcstoll.c              | 10 ++--
 newlib/libc/stdlib/wcstombs.c             |  4 +-
 newlib/libc/stdlib/wcstombs_r.c           |  8 ++--
 newlib/libc/stdlib/wcstoul.c              | 10 ++--
 newlib/libc/stdlib/wcstoull.c             | 10 ++--
 newlib/libc/stdlib/wctomb.c               |  2 +-
 newlib/libc/stdlib/wctomb_r.c             | 36 +++++++-------
 newlib/libc/string/bcmp.c                 |  4 +-
 newlib/libc/string/bcopy.c                |  4 +-
 newlib/libc/string/index.c                |  2 +-
 newlib/libc/string/memccpy.c              |  6 +--
 newlib/libc/string/memchr.c               |  4 +-
 newlib/libc/string/memcmp.c               |  4 +-
 newlib/libc/string/memcpy.c               |  4 +-
 newlib/libc/string/memmem.c               |  6 +--
 newlib/libc/string/memmove.c              |  4 +-
 newlib/libc/string/mempcpy.c              |  4 +-
 newlib/libc/string/memrchr.c              |  4 +-
 newlib/libc/string/memset.c               |  4 +-
 newlib/libc/string/rawmemchr.c            |  2 +-
 newlib/libc/string/rindex.c               |  2 +-
 newlib/libc/string/stpcpy.c               |  2 +-
 newlib/libc/string/stpncpy.c              |  4 +-
 newlib/libc/string/strcasecmp.c           |  2 +-
 newlib/libc/string/strcasestr.c           |  2 +-
 newlib/libc/string/strcat.c               |  2 +-
 newlib/libc/string/strchr.c               |  2 +-
 newlib/libc/string/strchrnul.c            |  2 +-
 newlib/libc/string/strcmp.c               |  2 +-
 newlib/libc/string/strcoll.c              |  2 +-
 newlib/libc/string/strcpy.c               |  2 +-
 newlib/libc/string/strcspn.c              |  2 +-
 newlib/libc/string/strdup_r.c             |  2 +-
 newlib/libc/string/strerror.c             |  6 +--
 newlib/libc/string/strerror_r.c           |  4 +-
 newlib/libc/string/strlcat.c              |  4 +-
 newlib/libc/string/strlcpy.c              |  4 +-
 newlib/libc/string/strncasecmp.c          |  4 +-
 newlib/libc/string/strncat.c              |  4 +-
 newlib/libc/string/strncmp.c              |  4 +-
 newlib/libc/string/strncpy.c              |  4 +-
 newlib/libc/string/strndup.c              |  2 +-
 newlib/libc/string/strndup_r.c            |  4 +-
 newlib/libc/string/strnlen.c              |  2 +-
 newlib/libc/string/strpbrk.c              |  2 +-
 newlib/libc/string/strrchr.c              |  2 +-
 newlib/libc/string/strsep.c               |  2 +-
 newlib/libc/string/strspn.c               |  2 +-
 newlib/libc/string/strstr.c               |  2 +-
 newlib/libc/string/strtok.c               |  2 +-
 newlib/libc/string/strtok_r.c             | 10 ++--
 newlib/libc/string/strxfrm.c              |  4 +-
 newlib/libc/string/swab.c                 |  4 +-
 newlib/libc/string/u_strerr.c             |  4 +-
 newlib/libc/string/wcpcpy.c               |  2 +-
 newlib/libc/string/wcpncpy.c              |  4 +-
 newlib/libc/string/wcscasecmp.c           |  2 +-
 newlib/libc/string/wcscat.c               |  2 +-
 newlib/libc/string/wcschr.c               |  2 +-
 newlib/libc/string/wcscmp.c               |  2 +-
 newlib/libc/string/wcscoll.c              |  2 +-
 newlib/libc/string/wcscpy.c               |  2 +-
 newlib/libc/string/wcscspn.c              |  2 +-
 newlib/libc/string/wcslcat.c              |  4 +-
 newlib/libc/string/wcslcpy.c              |  4 +-
 newlib/libc/string/wcsncasecmp.c          |  4 +-
 newlib/libc/string/wcsncat.c              |  4 +-
 newlib/libc/string/wcsncmp.c              |  4 +-
 newlib/libc/string/wcsncpy.c              |  4 +-
 newlib/libc/string/wcsnlen.c              |  2 +-
 newlib/libc/string/wcspbrk.c              |  2 +-
 newlib/libc/string/wcsrchr.c              |  2 +-
 newlib/libc/string/wcsspn.c               |  2 +-
 newlib/libc/string/wcsstr.c               |  2 +-
 newlib/libc/string/wcstok.c               |  4 +-
 newlib/libc/string/wcswidth.c             |  2 +-
 newlib/libc/string/wcsxfrm.c              |  4 +-
 newlib/libc/string/wmemchr.c              |  4 +-
 newlib/libc/string/wmemcmp.c              |  4 +-
 newlib/libc/string/wmemcpy.c              |  4 +-
 newlib/libc/string/wmemmove.c             |  4 +-
 newlib/libc/string/wmempcpy.c             |  4 +-
 newlib/libc/string/wmemset.c              |  4 +-
 newlib/libc/string/xpg_strerror_r.c       |  4 +-
 newlib/libc/sys/a29khif/kill.c            |  2 +-
 newlib/libc/sys/h8300hms/misc.c           |  2 +-
 newlib/libc/sys/h8500hms/misc.c           |  2 +-
 newlib/libc/sys/linux/pread.c             | 14 +++---
 newlib/libc/sys/linux/pread64.c           |  6 +--
 newlib/libc/sys/linux/pwrite.c            | 14 +++---
 newlib/libc/sys/linux/pwrite64.c          |  6 +--
 newlib/libc/sys/sysnec810/misc.c          |  2 +-
 newlib/libc/syscalls/sysexecve.c          |  4 +-
 newlib/libc/syscalls/sysfcntl.c           |  4 +-
 newlib/libc/syscalls/sysfstat.c           |  2 +-
 newlib/libc/syscalls/sysgettod.c          |  2 +-
 newlib/libc/syscalls/syskill.c            |  2 +-
 newlib/libc/syscalls/syslink.c            |  2 +-
 newlib/libc/syscalls/syslseek.c           |  4 +-
 newlib/libc/syscalls/sysopen.c            |  2 +-
 newlib/libc/syscalls/sysread.c            |  4 +-
 newlib/libc/syscalls/sysstat.c            |  2 +-
 newlib/libc/syscalls/syswrite.c           |  4 +-
 newlib/libc/time/asctime_r.c              |  2 +-
 newlib/libc/time/ctime_r.c                |  2 +-
 newlib/libc/time/difftime.c               |  2 +-
 newlib/libc/time/gmtime_r.c               |  2 +-
 newlib/libc/time/lcltime_r.c              |  2 +-
 newlib/libc/time/strftime.c               |  6 +--
 newlib/libc/unix/pread.c                  | 14 +++---
 newlib/libc/unix/pwrite.c                 | 14 +++---
 newlib/libc/unix/ttyname_r.c              |  4 +-
 newlib/libc/xdr/xdr.c                     | 80 +++++++++++++++----------------
 newlib/libc/xdr/xdr_array.c               | 18 +++----
 newlib/libc/xdr/xdr_float.c               |  4 +-
 newlib/libc/xdr/xdr_float_vax.c           |  4 +-
 newlib/libc/xdr/xdr_mem.c                 | 36 +++++++-------
 newlib/libc/xdr/xdr_private.c             |  2 +-
 newlib/libc/xdr/xdr_rec.c                 | 48 +++++++++----------
 newlib/libc/xdr/xdr_reference.c           | 12 ++---
 newlib/libc/xdr/xdr_sizeof.c              | 14 +++---
 newlib/libc/xdr/xdr_stdio.c               | 24 +++++-----
 newlib/libm/mathfp/s_asine.c              |  2 +-
 newlib/libm/mathfp/s_atan2.c              |  2 +-
 newlib/libm/mathfp/s_atangent.c           |  6 +--
 newlib/libm/mathfp/s_ldexp.c              |  2 +-
 newlib/libm/mathfp/s_logarithm.c          |  2 +-
 newlib/libm/mathfp/s_sincos.c             |  4 +-
 newlib/libm/mathfp/s_sine.c               |  2 +-
 newlib/libm/mathfp/s_sineh.c              |  2 +-
 newlib/libm/mathfp/sf_asine.c             |  2 +-
 newlib/libm/mathfp/sf_atan2.c             |  2 +-
 newlib/libm/mathfp/sf_atangent.c          |  6 +--
 newlib/libm/mathfp/sf_fmod.c              |  2 +-
 newlib/libm/mathfp/sf_ldexp.c             |  2 +-
 newlib/libm/mathfp/sf_logarithm.c         |  2 +-
 newlib/libm/mathfp/sf_sincos.c            |  4 +-
 newlib/libm/mathfp/sf_sine.c              |  2 +-
 newlib/libm/mathfp/sf_sineh.c             |  2 +-
 newlib/libm/test/convert.c                | 10 ++--
 newlib/libm/test/dcvt.c                   | 42 ++++++++--------
 newlib/libm/test/math.c                   | 44 ++++++++---------
 newlib/libm/test/string.c                 | 10 ++--
 newlib/libm/test/test.c                   | 20 ++++----
 newlib/libm/test/test_ieee.c              |  2 +-
 newlib/libm/test/test_is.c                | 12 ++---
 517 files changed, 1771 insertions(+), 1773 deletions(-)

diff --git a/libgloss/cr16/fstat.c b/libgloss/cr16/fstat.c
index 637f87db5..73e1fa248 100644
--- a/libgloss/cr16/fstat.c
+++ b/libgloss/cr16/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/cr16/isatty.c b/libgloss/cr16/isatty.c
index 1cb32e5c7..604e8f097 100644
--- a/libgloss/cr16/isatty.c
+++ b/libgloss/cr16/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),
diff --git a/libgloss/cr16/kill.c b/libgloss/cr16/kill.c
index b37584400..43c3ec554 100644
--- a/libgloss/cr16/kill.c
+++ b/libgloss/cr16/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/cr16/stat.c b/libgloss/cr16/stat.c
index f1769cdac..743fc94a9 100644
--- a/libgloss/cr16/stat.c
+++ b/libgloss/cr16/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c
index 380fc2aaa..75f863583 100644
--- a/libgloss/crx/fstat.c
+++ b/libgloss/crx/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c
index 927d75497..ac3d041e7 100644
--- a/libgloss/crx/isatty.c
+++ b/libgloss/crx/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (isatty, (fd),
diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c
index 3ed228fd2..db5018cfc 100644
--- a/libgloss/crx/kill.c
+++ b/libgloss/crx/kill.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c
index 6ffef821b..9562b9097 100644
--- a/libgloss/crx/stat.c
+++ b/libgloss/crx/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/frv/fstat.c b/libgloss/frv/fstat.c
index 756f7b261..680c4a1c0 100644
--- a/libgloss/frv/fstat.c
+++ b/libgloss/frv/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/frv/isatty.c b/libgloss/frv/isatty.c
index b021b4ff8..e4c99065b 100644
--- a/libgloss/frv/isatty.c
+++ b/libgloss/frv/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),
diff --git a/libgloss/frv/kill.c b/libgloss/frv/kill.c
index 7c365fd06..8dda1e9a6 100644
--- a/libgloss/frv/kill.c
+++ b/libgloss/frv/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/frv/sim-time.c b/libgloss/frv/sim-time.c
index c4746b482..196f855ad 100644
--- a/libgloss/frv/sim-time.c
+++ b/libgloss/frv/sim-time.c
@@ -66,7 +66,7 @@ _DEFUN (_times, _times (buf),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
  void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/frv/stat.c b/libgloss/frv/stat.c
index 094ab4875..ceaedc216 100644
--- a/libgloss/frv/stat.c
+++ b/libgloss/frv/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/fstat.c b/libgloss/fstat.c
index 8082d6395..e7f913358 100644
--- a/libgloss/fstat.c
+++ b/libgloss/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (fstat, (fd, buf),
-       int fd _AND
+       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 77058b2d1..0bd432e58 100644
--- a/libgloss/ft32/fstat.c
+++ b/libgloss/ft32/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;        /* Always pretend to be a tty */
diff --git a/libgloss/ft32/isatty.c b/libgloss/ft32/isatty.c
index 449410ebe..fd2d73760 100644
--- a/libgloss/ft32/isatty.c
+++ b/libgloss/ft32/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),
diff --git a/libgloss/ft32/kill.c b/libgloss/ft32/kill.c
index 765b03e78..4b2241f56 100644
--- a/libgloss/ft32/kill.c
+++ b/libgloss/ft32/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/ft32/sim-lseek.S b/libgloss/ft32/sim-lseek.S
index 2dfde1625..c2a134ca1 100644
--- a/libgloss/ft32/sim-lseek.S
+++ b/libgloss/ft32/sim-lseek.S
@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;
diff --git a/libgloss/ft32/sim-lseek.c b/libgloss/ft32/sim-lseek.c
index 297de2b8a..e5c08c8e7 100644
--- a/libgloss/ft32/sim-lseek.c
+++ b/libgloss/ft32/sim-lseek.c
@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   /*   errno = ESPIPE; */
diff --git a/libgloss/ft32/sim-time.c b/libgloss/ft32/sim-time.c
index 25e72a1f4..8f417ebb7 100644
--- a/libgloss/ft32/sim-time.c
+++ b/libgloss/ft32/sim-time.c
@@ -34,7 +34,7 @@ _DEFUN (_times, _times (buf),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-        struct timeval *tv _AND
+        struct timeval *tv,
         void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/ft32/stat.c b/libgloss/ft32/stat.c
index 580e2ca6e..4d738efe2 100644
--- a/libgloss/ft32/stat.c
+++ b/libgloss/ft32/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/isatty.c b/libgloss/isatty.c
index 2d66cd652..675d99bc2 100644
--- a/libgloss/isatty.c
+++ b/libgloss/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes, return a 1.
  */
 int
 _DEFUN (isatty, (fd),
diff --git a/libgloss/kill.c b/libgloss/kill.c
index afc1257cf..ada45f6c8 100644
--- a/libgloss/kill.c
+++ b/libgloss/kill.c
@@ -19,7 +19,7 @@
  */
 int
 _DEFUN (kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c
index 67f98d59d..0ddb85d03 100644
--- a/libgloss/libnosys/chown.c
+++ b/libgloss/libnosys/chown.c
@@ -13,8 +13,8 @@ extern int errno;
 
 int
 _DEFUN (_chown, (path, owner, group),
-        const char *path  _AND
-        uid_t owner _AND
+        const char *path,
+        uid_t owner,
         gid_t group)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/execve.c b/libgloss/libnosys/execve.c
index 01743fff9..a93641a34 100644
--- a/libgloss/libnosys/execve.c
+++ b/libgloss/libnosys/execve.c
@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_execve, (name, argv, env),
-        char  *name  _AND
-        char **argv  _AND
+        char  *name,
+        char **argv,
         char **env)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/fstat.c b/libgloss/libnosys/fstat.c
index 4e18d4216..d04b40721 100644
--- a/libgloss/libnosys/fstat.c
+++ b/libgloss/libnosys/fstat.c
@@ -14,7 +14,7 @@ extern int errno;
 
 int
 _DEFUN (_fstat, (fildes, st),
-        int          fildes _AND
+        int          fildes,
         struct stat *st)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/gettod.c b/libgloss/libnosys/gettod.c
index 4d42b4b42..5e0b2db55 100644
--- a/libgloss/libnosys/gettod.c
+++ b/libgloss/libnosys/gettod.c
@@ -16,7 +16,7 @@ struct timeval;
 
 int
 _DEFUN (_gettimeofday, (ptimeval, ptimezone),
-        struct timeval  *ptimeval  _AND
+        struct timeval  *ptimeval,
         void *ptimezone)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/kill.c b/libgloss/libnosys/kill.c
index f1d12c646..c58328794 100644
--- a/libgloss/libnosys/kill.c
+++ b/libgloss/libnosys/kill.c
@@ -12,7 +12,7 @@ extern int errno;
 
 int
 _DEFUN (_kill, (pid, sig),
-        int pid  _AND
+        int pid,
         int sig)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/link.c b/libgloss/libnosys/link.c
index 35881cf7f..b27b5bca6 100644
--- a/libgloss/libnosys/link.c
+++ b/libgloss/libnosys/link.c
@@ -12,7 +12,7 @@ extern int errno;
 
 int
 _DEFUN (_link, (existing, new),
-        char *existing _AND
+        char *existing,
         char *new)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/lseek.c b/libgloss/libnosys/lseek.c
index 0aa89e272..f583a1461 100644
--- a/libgloss/libnosys/lseek.c
+++ b/libgloss/libnosys/lseek.c
@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_lseek, (file, ptr, dir),
-        int   file  _AND
-        int   ptr   _AND
+        int   file,
+        int   ptr,
         int   dir)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/open.c b/libgloss/libnosys/open.c
index 2c8a6ceb9..ee8becedc 100644
--- a/libgloss/libnosys/open.c
+++ b/libgloss/libnosys/open.c
@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_open, (file, flags, mode),
-        char *file  _AND
-        int   flags _AND
+        char *file,
+        int   flags,
         int   mode)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/read.c b/libgloss/libnosys/read.c
index 1a2819c08..0ff3a9a8c 100644
--- a/libgloss/libnosys/read.c
+++ b/libgloss/libnosys/read.c
@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_read, (file, ptr, len),
-        int   file  _AND
-        char *ptr   _AND
+        int   file,
+        char *ptr,
         int   len)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c
index 7df253c40..00f3f8982 100644
--- a/libgloss/libnosys/readlink.c
+++ b/libgloss/libnosys/readlink.c
@@ -13,8 +13,8 @@ extern int errno;
 
 int
 _DEFUN (_readlink, (path, buf, bufsize),
-        const char *path _AND
-        char *buf _AND
+        const char *path,
+        char *buf,
         size_t bufsize)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/stat.c b/libgloss/libnosys/stat.c
index 7c3463798..9fa7003d1 100644
--- a/libgloss/libnosys/stat.c
+++ b/libgloss/libnosys/stat.c
@@ -14,7 +14,7 @@ extern int errno;
 
 int
 _DEFUN (_stat, (file, st),
-        const char  *file _AND
+        const char  *file,
         struct stat *st)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c
index d9e29f2e4..cf7a15896 100644
--- a/libgloss/libnosys/symlink.c
+++ b/libgloss/libnosys/symlink.c
@@ -12,7 +12,7 @@ extern int errno;
 
 int
 _DEFUN (_symlink, (path1, path2),
-        const char *path1 _AND
+        const char *path1,
         const char *path2)
 {
   errno = ENOSYS;
diff --git a/libgloss/libnosys/write.c b/libgloss/libnosys/write.c
index 0136d74ce..0ada7702b 100644
--- a/libgloss/libnosys/write.c
+++ b/libgloss/libnosys/write.c
@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_write, (file, ptr, len),
-        int   file  _AND
-        char *ptr   _AND
+        int   file,
+        char *ptr,
         int   len)
 {
   errno = ENOSYS;
diff --git a/libgloss/lseek.c b/libgloss/lseek.c
index 1df36f55e..42a28d966 100644
--- a/libgloss/lseek.c
+++ b/libgloss/lseek.c
@@ -21,8 +21,8 @@
  */
 off_t
 _DEFUN (lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;
diff --git a/libgloss/mcore/fstat.c b/libgloss/mcore/fstat.c
index 02054641b..6a2323a6e 100644
--- a/libgloss/mcore/fstat.c
+++ b/libgloss/mcore/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/mcore/kill.c b/libgloss/mcore/kill.c
index 43a359760..8883c8ecd 100644
--- a/libgloss/mcore/kill.c
+++ b/libgloss/mcore/kill.c
@@ -19,7 +19,7 @@
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/mcore/lseek.c b/libgloss/mcore/lseek.c
index 0f236fe64..423e11e55 100644
--- a/libgloss/mcore/lseek.c
+++ b/libgloss/mcore/lseek.c
@@ -21,8 +21,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;
diff --git a/libgloss/mcore/open.c b/libgloss/mcore/open.c
index a9e99597f..6b816e891 100644
--- a/libgloss/mcore/open.c
+++ b/libgloss/mcore/open.c
@@ -21,8 +21,8 @@
  */
 int
 _DEFUN (_open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
+       const char *buf,
+       int flags,
        int mode)
 {
   errno = EIO;
diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c
index 499426d1b..8f394780c 100644
--- a/libgloss/mcore/read.c
+++ b/libgloss/mcore/read.c
@@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
  */
 int
 _DEFUN (_read, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i = 0;
diff --git a/libgloss/mcore/stat.c b/libgloss/mcore/stat.c
index 401a6b50d..d07042a51 100644
--- a/libgloss/mcore/stat.c
+++ b/libgloss/mcore/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 7f39fd1bb..189ea6222 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -23,8 +23,8 @@ extern int  _EXFUN (outbyte, (char x));
  */
 int
 _DEFUN (_write, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i;
diff --git a/libgloss/moxie/fstat.c b/libgloss/moxie/fstat.c
index 6464a861b..38dd07b34 100644
--- a/libgloss/moxie/fstat.c
+++ b/libgloss/moxie/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/moxie/isatty.c b/libgloss/moxie/isatty.c
index 14cb9c42c..73ade0741 100644
--- a/libgloss/moxie/isatty.c
+++ b/libgloss/moxie/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),
diff --git a/libgloss/moxie/kill.c b/libgloss/moxie/kill.c
index 257c491e0..d602829ce 100644
--- a/libgloss/moxie/kill.c
+++ b/libgloss/moxie/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/moxie/qemu-time.c b/libgloss/moxie/qemu-time.c
index 4b0920994..1abd5a9f7 100644
--- a/libgloss/moxie/qemu-time.c
+++ b/libgloss/moxie/qemu-time.c
@@ -101,7 +101,7 @@ _DEFUN (time, time (t),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
  void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/sim-lseek.S b/libgloss/moxie/sim-lseek.S
index 1c799f872..5e5493cd7 100644
--- a/libgloss/moxie/sim-lseek.S
+++ b/libgloss/moxie/sim-lseek.S
@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;
diff --git a/libgloss/moxie/sim-lseek.c b/libgloss/moxie/sim-lseek.c
index 8e7ee50e9..d22d7226c 100644
--- a/libgloss/moxie/sim-lseek.c
+++ b/libgloss/moxie/sim-lseek.c
@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   /*   errno = ESPIPE; */
diff --git a/libgloss/moxie/sim-time.c b/libgloss/moxie/sim-time.c
index 3e9fafb4b..d3f43d385 100644
--- a/libgloss/moxie/sim-time.c
+++ b/libgloss/moxie/sim-time.c
@@ -65,7 +65,7 @@ _DEFUN (_times, _times (buf),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
  void *tzvp)
 {
   struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/stat.c b/libgloss/moxie/stat.c
index 0d7511ae6..01a958210 100644
--- a/libgloss/moxie/stat.c
+++ b/libgloss/moxie/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/open.c b/libgloss/open.c
index 468b11cd1..90787b1b9 100644
--- a/libgloss/open.c
+++ b/libgloss/open.c
@@ -21,8 +21,8 @@
  */
 int
 _DEFUN (open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
+       const char *buf,
+       int flags,
        int mode)
 {
   errno = EIO;
diff --git a/libgloss/read.c b/libgloss/read.c
index 419a8ed64..2e5e0c72c 100644
--- a/libgloss/read.c
+++ b/libgloss/read.c
@@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
  */
 int
 _DEFUN (read, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i = 0;
diff --git a/libgloss/stat.c b/libgloss/stat.c
index ebb7de3f5..5957645c6 100644
--- a/libgloss/stat.c
+++ b/libgloss/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/libgloss/tic6x/kill.c b/libgloss/tic6x/kill.c
index 3ed228fd2..db5018cfc 100644
--- a/libgloss/tic6x/kill.c
+++ b/libgloss/tic6x/kill.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/write.c b/libgloss/write.c
index 292a68e53..69f452c34 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -23,8 +23,8 @@ extern int  _EXFUN (outbyte, (char x));
  */
 int
 _DEFUN (write, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i;
diff --git a/libgloss/xc16x/misc.c b/libgloss/xc16x/misc.c
index 786db36dd..2eb951a5a 100644
--- a/libgloss/xc16x/misc.c
+++ b/libgloss/xc16x/misc.c
@@ -31,7 +31,7 @@ int _DEFUN(_getpid,(),)
 }
 
 int _DEFUN(_kill,(pid, sig),
-   int pid _AND
+   int pid,
    int sig)
 {
   errno = ENOSYS;
diff --git a/libgloss/xstormy16/fstat.c b/libgloss/xstormy16/fstat.c
index 982d578cb..2926ccaab 100644
--- a/libgloss/xstormy16/fstat.c
+++ b/libgloss/xstormy16/fstat.c
@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/xstormy16/isatty.c b/libgloss/xstormy16/isatty.c
index e3c32051a..0e92a9f4f 100644
--- a/libgloss/xstormy16/isatty.c
+++ b/libgloss/xstormy16/isatty.c
@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),
diff --git a/libgloss/xstormy16/kill.c b/libgloss/xstormy16/kill.c
index 0bbc0141a..2374dc29d 100644
--- a/libgloss/xstormy16/kill.c
+++ b/libgloss/xstormy16/kill.c
@@ -19,7 +19,7 @@
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)
diff --git a/libgloss/xstormy16/lseek.c b/libgloss/xstormy16/lseek.c
index 640a96ea0..11dbab08e 100644
--- a/libgloss/xstormy16/lseek.c
+++ b/libgloss/xstormy16/lseek.c
@@ -21,8 +21,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;
diff --git a/libgloss/xstormy16/open.c b/libgloss/xstormy16/open.c
index a2c318e1a..600f92982 100644
--- a/libgloss/xstormy16/open.c
+++ b/libgloss/xstormy16/open.c
@@ -21,8 +21,8 @@
  */
 int
 _DEFUN (_open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
+       const char *buf,
+       int flags,
        int mode)
 {
   errno = EIO;
diff --git a/libgloss/xstormy16/stat.c b/libgloss/xstormy16/stat.c
index c766a341c..b80b83c6c 100644
--- a/libgloss/xstormy16/stat.c
+++ b/libgloss/xstormy16/stat.c
@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;
diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
index 1c3b17025..3194f0851 100644
--- a/newlib/libc/argz/argz_add.c
+++ b/newlib/libc/argz/argz_add.c
@@ -12,8 +12,8 @@
 
 error_t
 _DEFUN (argz_add, (argz, argz_len, str),
-       char **argz _AND
-       size_t *argz_len _AND
+       char **argz,
+       size_t *argz_len,
        const char *str)
 {
   int len_to_add = 0;
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
index 7dfbb4d6e..92c73716d 100644
--- a/newlib/libc/argz/argz_add_sep.c
+++ b/newlib/libc/argz/argz_add_sep.c
@@ -12,9 +12,9 @@
 
 error_t
 _DEFUN (argz_add_sep, (argz, argz_len, str, sep),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str _AND
+       char **argz,
+       size_t *argz_len,
+       const char *str,
        int sep)
 {
   char *str_argz = 0;
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
index c6c3dbee9..a84f8e0b9 100644
--- a/newlib/libc/argz/argz_append.c
+++ b/newlib/libc/argz/argz_append.c
@@ -12,9 +12,9 @@
 
 error_t
 _DEFUN (argz_append, (argz, argz_len, buf, buf_len),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *buf _AND
+       char **argz,
+       size_t *argz_len,
+       const char *buf,
        size_t buf_len)
 {
   if (buf_len)
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
index 4761275df..33d0eecc2 100644
--- a/newlib/libc/argz/argz_count.c
+++ b/newlib/libc/argz/argz_count.c
@@ -11,7 +11,7 @@
 
 size_t
 _DEFUN (argz_count, (argz, argz_len),
-       const char *argz _AND
+       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 9d7b2f13d..d4b8b0592 100644
--- a/newlib/libc/argz/argz_create.c
+++ b/newlib/libc/argz/argz_create.c
@@ -12,8 +12,8 @@
 
 error_t
 _DEFUN (argz_create, (argv, argz, argz_len),
-       char *const argv[] _AND
-       char **argz _AND
+       char *const argv[],
+       char **argz,
        size_t *argz_len)
 {
   int argc = 0;
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
index 38866e1d5..afff44c1e 100644
--- a/newlib/libc/argz/argz_create_sep.c
+++ b/newlib/libc/argz/argz_create_sep.c
@@ -12,9 +12,9 @@
 
 error_t
 _DEFUN (argz_create_sep, (string, sep, argz, argz_len),
-       const char *string _AND
-       int sep _AND
-       char **argz _AND
+       const char *string,
+       int sep,
+       char **argz,
        size_t *argz_len)
 {
   int len = 0;
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
index aa94f6d7a..a4e12273d 100644
--- a/newlib/libc/argz/argz_delete.c
+++ b/newlib/libc/argz/argz_delete.c
@@ -12,8 +12,8 @@
 
 error_t
 _DEFUN (argz_delete, (argz, argz_len, entry),
-       char **argz _AND
-       size_t *argz_len _AND
+       char **argz,
+       size_t *argz_len,
        char *entry)
 {
   int len = 0;
diff --git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
index a819f3953..4932de6a9 100644
--- a/newlib/libc/argz/argz_extract.c
+++ b/newlib/libc/argz/argz_extract.c
@@ -10,8 +10,8 @@
 
 void
 _DEFUN (argz_extract, (argz, argz_len, argv),
-       char *argz _AND
-       size_t argz_len _AND
+       char *argz,
+       size_t argz_len,
        char **argv)
 {
   size_t i = 0;
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index d0a32eca9..5965e04a6 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -14,9 +14,9 @@
 
 error_t
 _DEFUN (argz_insert, (argz, argz_len, before, entry),
-       char **argz _AND
-       size_t *argz_len _AND
-       char *before _AND
+       char **argz,
+       size_t *argz_len,
+       char *before,
        const char *entry)
 {
   int len = 0;
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
index 94852f538..3f672217e 100644
--- a/newlib/libc/argz/argz_next.c
+++ b/newlib/libc/argz/argz_next.c
@@ -12,8 +12,8 @@
 
 char *
 _DEFUN (argz_next, (argz, argz_len, entry),
-       char *argz _AND
-       size_t argz_len _AND
+       char *argz,
+       size_t argz_len,
        const char *entry)
 {
   if (entry)
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
index b274f91b6..e6c6ead3e 100644
--- a/newlib/libc/argz/argz_replace.c
+++ b/newlib/libc/argz/argz_replace.c
@@ -14,10 +14,10 @@
 
 error_t
 _DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str _AND
-       const char *with _AND
+       char **argz,
+       size_t *argz_len,
+       const char *str,
+       const char *with,
        unsigned *replace_count)
 {
   const int str_len = strlen(str);
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
index be5f2cf45..72895f5e7 100644
--- a/newlib/libc/argz/argz_stringify.c
+++ b/newlib/libc/argz/argz_stringify.c
@@ -11,8 +11,8 @@
 
 void
 _DEFUN (argz_stringify, (argz, argz_len, sep),
-       char *argz _AND
-       size_t argz_len _AND
+       char *argz,
+       size_t argz_len,
        int sep)
 {
   size_t i;
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
index 3e91a5867..f01d09926 100644
--- a/newlib/libc/argz/envz_add.c
+++ b/newlib/libc/argz/envz_add.c
@@ -13,9 +13,9 @@
 
 error_t
 _DEFUN (envz_add, (envz, envz_len, name, value),
-       char **envz _AND
-       size_t *envz_len _AND
-       const char *name _AND
+       char **envz,
+       size_t *envz_len,
+       const char *name,
        const char *value)
 {
   char *concat = NULL;
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
index 3d1986ba7..bbe38529e 100644
--- a/newlib/libc/argz/envz_entry.c
+++ b/newlib/libc/argz/envz_entry.c
@@ -14,8 +14,8 @@
 
 char *
 _DEFUN (envz_entry, (envz, envz_len, name),
-       const char *envz _AND
-       size_t envz_len _AND
+       const char *envz,
+       size_t envz_len,
        const char *name)
 {
   char *buf_ptr = (char *)envz;
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
index b4f7c2806..62d3d0cff 100644
--- a/newlib/libc/argz/envz_get.c
+++ b/newlib/libc/argz/envz_get.c
@@ -14,8 +14,8 @@
 
 char *
 _DEFUN (envz_get, (envz, envz_len, name),
-       const char *envz _AND
-       size_t envz_len _AND
+       const char *envz,
+       size_t envz_len,
        const char *name)
 {
   char *buf_ptr = (char *)envz;
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
index 8a26bc3c3..9299069e4 100644
--- a/newlib/libc/argz/envz_merge.c
+++ b/newlib/libc/argz/envz_merge.c
@@ -13,10 +13,10 @@
 
 error_t
 _DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
-       char **envz _AND
-       size_t *envz_len _AND
-       const char *envz2 _AND
-       size_t envz2_len _AND
+       char **envz,
+       size_t *envz_len,
+       const char *envz2,
+       size_t envz2_len,
        int override)
 {
   char *entry = NULL;
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
index 1882297f0..2558656aa 100644
--- a/newlib/libc/argz/envz_remove.c
+++ b/newlib/libc/argz/envz_remove.c
@@ -13,8 +13,8 @@
 
 void
 _DEFUN (envz_remove, (envz, envz_len, name),
-       char **envz _AND
-       size_t *envz_len _AND
+       char **envz,
+       size_t *envz_len,
        const char *name)
 {
   char *entry = NULL;
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
index e1c461091..857f8492e 100644
--- a/newlib/libc/argz/envz_strip.c
+++ b/newlib/libc/argz/envz_strip.c
@@ -13,7 +13,7 @@
 
 void
 _DEFUN (envz_strip, (envz, envz_len),
-       char **envz _AND
+       char **envz,
        size_t *envz_len)
 {
   char *entry = 0;
diff --git a/newlib/libc/ctype/iswctype.c b/newlib/libc/ctype/iswctype.c
index bfa7b003c..89c0f9a31 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 _AND wctype_t desc)
+_DEFUN(iswctype,(c, desc), wint_t c, wctype_t desc)
 {
   switch (desc)
     {
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
index f5bd7dbf2..8fbd1b083 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 _AND int type)
+_DEFUN (__jp2uc, (c, type), wint_t c, int type)
 {
   int index, adj;
   unsigned char byte1, byte2;
diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c
index 5528542ff..3500cbaac 100644
--- a/newlib/libc/ctype/towctrans.c
+++ b/newlib/libc/ctype/towctrans.c
@@ -77,8 +77,8 @@ No supporting OS subroutines are required.
 
 wint_t
 _DEFUN (_towctrans_r, (r, c, w),
- struct _reent *r _AND
- wint_t c _AND
+ struct _reent *r,
+ wint_t c,
  wctrans_t w)
 {
   if (w == WCT_TOLOWER)
@@ -95,7 +95,7 @@ _DEFUN (_towctrans_r, (r, c, w),
 #ifndef _REENT_ONLY
 wint_t
 _DEFUN (towctrans, (c, w),
- wint_t c _AND
+ wint_t c,
         wctrans_t w)
 {
   return _towctrans_r (_REENT, c, w);
diff --git a/newlib/libc/ctype/wctrans.c b/newlib/libc/ctype/wctrans.c
index dd5b28c4b..7183c45ca 100644
--- a/newlib/libc/ctype/wctrans.c
+++ b/newlib/libc/ctype/wctrans.c
@@ -76,7 +76,7 @@ No supporting OS subroutines are required.
 
 wctrans_t
 _DEFUN (_wctrans_r, (r, c),
- struct _reent *r _AND
+ struct _reent *r,
  const char *c)
 {
   if (!strcmp (c, "tolower"))
diff --git a/newlib/libc/ctype/wctype.c b/newlib/libc/ctype/wctype.c
index c1a70eebb..6cd9425bc 100644
--- a/newlib/libc/ctype/wctype.c
+++ b/newlib/libc/ctype/wctype.c
@@ -77,7 +77,7 @@ No supporting OS subroutines are required.
 
 wctype_t
 _DEFUN (_wctype_r, (r, c),
- struct _reent *r _AND
+ struct _reent *r,
  const char *c)
 {
   switch (*c)
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 749269766..62bab771e 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -102,7 +102,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
 #if defined (ICONV_FROM_UCS_CES_EUC)
 static _VOID_PTR
 _DEFUN(euc_from_ucs_init, (rptr, encoding),
-                          struct _reent *rptr _AND
+                          struct _reent *rptr,
                           _CONST char *encoding)
 {
   int i;
@@ -166,7 +166,7 @@ error1:
 
 static size_t
 _DEFUN(euc_from_ucs_close, (rptr, data),
-                           struct _reent *rptr _AND
+                           struct _reent *rptr,
                            _VOID_PTR data)
 {
   int i;
@@ -186,9 +186,9 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
 
 static size_t
 _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                             _VOID_PTR data         _AND
-                             register ucs4_t in     _AND
-                             unsigned char **outbuf _AND
+                             _VOID_PTR data,
+                             register ucs4_t in,
+                             unsigned char **outbuf,
                              size_t *outbytesleft)
 {
   int i;
@@ -262,7 +262,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_EUC)
 static _VOID_PTR
 _DEFUN(euc_to_ucs_init, (rptr, encoding),
-                        struct _reent *rptr _AND
+                        struct _reent *rptr,
                         _CONST char *encoding)
 {
   int i;
@@ -326,7 +326,7 @@ error1:
 
 static size_t
 _DEFUN(euc_to_ucs_close, (rptr, data),
-                         struct _reent *rptr _AND
+                         struct _reent *rptr,
                          _VOID_PTR data)
 {
   int i;
@@ -346,8 +346,8 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
 
 static ucs4_t
 _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
-                           _VOID_PTR data               _AND
-                           _CONST unsigned char **inbuf _AND
+                           _VOID_PTR data,
+                           _CONST unsigned char **inbuf,
                            size_t *inbytesleft)
 {
   int i;
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index fc46e27f2..650bf9af2 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -41,9 +41,9 @@
 #if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
 static size_t
 _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   if (*outbytesleft < 1)
@@ -66,7 +66,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 static _VOID_PTR
 _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
-                                struct _reent *rptr _AND
+                                struct _reent *rptr,
                                 _CONST char *encoding)
 {
   return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
@@ -74,7 +74,7 @@ _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
 
 static size_t
 _DEFUN(table_pcs_from_ucs_close, (rptr, data),
-                                 struct _reent *rptr _AND
+                                 struct _reent *rptr,
                                  _VOID_PTR data)
 {
   return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
@@ -92,8 +92,8 @@ _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_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   if (*inbytesleft < 1)
@@ -114,7 +114,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static _VOID_PTR
 _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
-                              struct _reent *rptr _AND
+                              struct _reent *rptr,
                               _CONST char *encoding)
 {
   return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
@@ -122,7 +122,7 @@ _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
 
 static size_t
 _DEFUN(table_pcs_to_ucs_close, (rptr, data),
-                               struct _reent *rptr _AND
+                               struct _reent *rptr,
                                _VOID_PTR data)
 {
   return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index e43e23faa..39c358cda 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -75,7 +75,7 @@ _EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
  */
 static size_t
 _DEFUN(table_close, (rptr, data),
-                    struct _reent *rptr _AND
+                    struct _reent *rptr,
                     _VOID_PTR data)
 {
   _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -90,7 +90,7 @@ _DEFUN(table_close, (rptr, data),
 #if defined (ICONV_FROM_UCS_CES_TABLE)
 static _VOID_PTR
 _DEFUN(table_init_from_ucs, (rptr, encoding),
-                            struct _reent *rptr _AND
+                            struct _reent *rptr,
                             _CONST char *encoding)
 {
   int i;
@@ -128,9 +128,9 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
 
 static size_t
 _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -173,7 +173,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_TABLE)
 static _VOID_PTR
 _DEFUN(table_init_to_ucs, (rptr, encoding),
-                          struct _reent *rptr _AND
+                          struct _reent *rptr,
                           _CONST char *encoding)
 {
   int i;
@@ -211,8 +211,8 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
 
 static ucs4_t
 _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -304,7 +304,7 @@ _iconv_from_ucs_ces_handlers_table =
  */
 static __inline ucs2_t
 _DEFUN(find_code_speed, (code, tblp),
-                        ucs2_t code _AND
+                        ucs2_t code,
                         _CONST __uint16_t *tblp)
 {
   int idx = tblp[code >> 8];
@@ -327,7 +327,7 @@ _DEFUN(find_code_speed, (code, tblp),
  */
 static __inline ucs2_t
 _DEFUN(find_code_speed_8bit, (code, tblp),
-                             ucs2_t code _AND
+                             ucs2_t code,
                              _CONST unsigned char *tblp)
 {
   int idx;
@@ -367,7 +367,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
  */
 static ucs2_t
 _DEFUN(find_code_size, (code, tblp),
-                       ucs2_t code _AND
+                       ucs2_t code,
                        _CONST __uint16_t *tblp)
 {
   int first, last, cur, center;
@@ -461,8 +461,8 @@ _DEFUN(find_code_size, (code, tblp),
  */
 static _CONST iconv_ccs_desc_t *
 _DEFUN(load_file, (rptr, name, direction),
-                  struct _reent *rptr _AND
-                  _CONST char *name   _AND
+                  struct _reent *rptr,
+                  _CONST char *name,
                   int direction)
 {
   int fd;
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 893bdd429..2aacce912 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -45,9 +45,9 @@
 #if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
 static size_t
 _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        _VOID_PTR data         _AND
-                                        register ucs4_t in     _AND
-                                        unsigned char **outbuf _AND
+                                        _VOID_PTR data,
+                                        register ucs4_t in,
+                                        unsigned char **outbuf,
                                         size_t *outbytesleft)
 {
   if (in > 0x0000FFFF)
@@ -67,8 +67,8 @@ _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_PTR data               _AND
-                                      _CONST unsigned char **inbuf _AND
+                                      _VOID_PTR data,
+                                      _CONST unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
   register ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 6f796ca54..000a7912f 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -51,7 +51,7 @@
 
 static _VOID_PTR
 _DEFUN(ucs_2_init, (rptr, encoding),
-                   struct _reent *rptr _AND
+                   struct _reent *rptr,
                    _CONST char *encoding)
 {
   int *data;
@@ -69,7 +69,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
 
 static size_t
 _DEFUN(ucs_2_close, (rptr, data),
-                    struct _reent *rptr _AND
+                    struct _reent *rptr,
                     _VOID_PTR data)
 {
   _free_r (rptr, data);
@@ -79,9 +79,9 @@ _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_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   if ((in  >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
@@ -106,8 +106,8 @@ _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_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index d8df9b157..4266b2afc 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -45,9 +45,9 @@
 #if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
 static size_t
 _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        _VOID_PTR data         _AND
-                                        register ucs4_t in     _AND
-                                        unsigned char **outbuf _AND
+                                        _VOID_PTR data,
+                                        register ucs4_t in,
+                                        unsigned char **outbuf,
                                         size_t *outbytesleft)
 {
   if (in > 0x7FFFFFFF)
@@ -67,8 +67,8 @@ _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_PTR data               _AND
-                                      _CONST unsigned char **inbuf _AND
+                                      _VOID_PTR data,
+                                      _CONST unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
   register ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index cfa7b367d..1d028c5dd 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -52,7 +52,7 @@
 
 static _VOID_PTR
 _DEFUN(ucs_4_init, (rptr, encoding),
-                   struct _reent *rptr _AND
+                   struct _reent *rptr,
                    _CONST char *encoding)
 {
   int *data;
@@ -70,7 +70,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
 
 static size_t
 _DEFUN(ucs_4_close, (rptr, data),
-                    struct _reent *rptr _AND
+                    struct _reent *rptr,
                     _VOID_PTR data)
 {
   _free_r(rptr, data);
@@ -81,9 +81,9 @@ _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_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   if ((in  >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
@@ -108,8 +108,8 @@ _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_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   ucs4_t res;
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index 2f213a7ed..eb4dee6e3 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -41,9 +41,9 @@
 #if defined (ICONV_FROM_UCS_CES_US_ASCII)
 static size_t
 _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                  _VOID_PTR data         _AND
-                                  ucs4_t in              _AND
-                                  unsigned char **outbuf _AND
+                                  _VOID_PTR data,
+                                  ucs4_t in,
+                                  unsigned char **outbuf,
                                   size_t *outbytesleft)
 {
   if (in  > 0x7F)
@@ -61,8 +61,8 @@ _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_PTR data               _AND
-                                _CONST unsigned char **inbuf _AND
+                                _VOID_PTR data,
+                                _CONST unsigned char **inbuf,
                                 size_t *inbytesleft)
 {
   ucs4_t res;
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index 4b2ff77a1..93cc4c341 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -59,7 +59,7 @@
 
 static size_t
 _DEFUN(utf_16_close, (rptr, data),
-                     struct _reent *rptr _AND
+                     struct _reent *rptr,
                      _VOID_PTR data)
 {
   _free_r(rptr, data);
@@ -69,7 +69,7 @@ _DEFUN(utf_16_close, (rptr, data),
 #if defined (ICONV_FROM_UCS_CES_UTF_16)
 static _VOID_PTR
 _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
-                             struct _reent *rptr _AND
+                             struct _reent *rptr,
                              _CONST char *encoding)
 {
   int *data;
@@ -89,9 +89,9 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
 
 static size_t
 _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                _VOID_PTR data         _AND
-                                register ucs4_t in     _AND
-                                unsigned char **outbuf _AND
+                                _VOID_PTR data,
+                                register ucs4_t in,
+                                unsigned char **outbuf,
                                 size_t *outbytesleft)
 {
   register ucs2_t *cp;
@@ -171,7 +171,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UTF_16)
 static _VOID_PTR
 _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
-                           struct _reent *rptr _AND
+                           struct _reent *rptr,
                            _CONST char *encoding)
 {
   int *data;
@@ -191,8 +191,8 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
 
 static ucs4_t
 _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
-                              _VOID_PTR data               _AND
-                              _CONST unsigned char **inbuf _AND
+                              _VOID_PTR data,
+                              _CONST unsigned char **inbuf,
                               size_t *inbytesleft)
 {
   register ucs2_t w1;
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index fda1e6e3b..f02dd6fcc 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -44,9 +44,9 @@
 #if defined (ICONV_FROM_UCS_CES_UTF_8)
 static size_t
 _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
-                         _VOID_PTR data         _AND
-                         register ucs4_t in     _AND
-                         unsigned char **outbuf _AND
+                         _VOID_PTR data,
+                         register ucs4_t in,
+                         unsigned char **outbuf,
                          size_t *outbytesleft)
 {
   register unsigned char *cp;
@@ -126,8 +126,8 @@ _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_PTR data               _AND
-                       _CONST unsigned char **inbuf _AND
+                       _VOID_PTR data,
+                       _CONST unsigned char **inbuf,
                        size_t *inbytesleft)
 {
   register _CONST unsigned char *in = *inbuf;
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 41497c608..278b84915 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -49,7 +49,7 @@
  */
 static _CONST char *
 _DEFUN(canonical_form, (rptr, str),
-                       struct _reent *rptr _AND
+                       struct _reent *rptr,
                        _CONST char *str)
 {
   char *p, *p1;
@@ -94,9 +94,9 @@ _DEFUN(canonical_form, (rptr, str),
  */
 static char *
 _DEFUN(find_alias, (rptr, alias, table, len),
-                   struct _reent *rptr _AND
-                   _CONST char *alias  _AND
-                   _CONST char *table  _AND
+                   struct _reent *rptr,
+                   _CONST char *alias,
+                   _CONST char *table,
                    int len)
 {
   _CONST char *end;
@@ -148,7 +148,7 @@ search_again:
  */
 char *
 _DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
-                                     struct _reent *rptr _AND
+                                     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 9d9d6a717..b8000e4be 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -121,7 +121,7 @@ No supporting OS subroutine calls are required.
 
 iconv_t
 _DEFUN(iconv_open, (to, from),
-                   _CONST char *to _AND
+                   _CONST char *to,
                    _CONST char *from)
 {
   return _iconv_open_r (_REENT, to, from);
@@ -130,10 +130,10 @@ _DEFUN(iconv_open, (to, from),
 
 size_t
 _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
-              iconv_t cd          _AND
-              char **__restrict inbuf _AND
-              size_t *__restrict inbytesleft _AND
-              char **__restrict outbuf       _AND
+              iconv_t cd,
+              char **__restrict inbuf,
+              size_t *__restrict inbytesleft,
+              char **__restrict outbuf,
               size_t *__restrict outbytesleft)
 {
     return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
@@ -151,8 +151,8 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
 #ifndef _REENT_ONLY
 iconv_t
 _DEFUN(_iconv_open_r, (rptr, to, from),
-                      struct _reent *rptr _AND
-                      _CONST char *to     _AND
+                      struct _reent *rptr,
+                      _CONST char *to,
                       _CONST char *from)
 {
   iconv_conversion_t *ic;
@@ -202,11 +202,11 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
 
 size_t
 _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                 struct _reent *rptr _AND
-                 iconv_t cd          _AND
-                 _CONST char **inbuf _AND
-                 size_t *inbytesleft _AND
-                 char **outbuf       _AND
+                 struct _reent *rptr,
+                 iconv_t cd,
+                 _CONST char **inbuf,
+                 size_t *inbytesleft,
+                 char **outbuf,
                  size_t *outbytesleft)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -289,7 +289,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
 int
 _DEFUN(_iconv_close_r, (rptr, cd),
-                       struct _reent *rptr _AND
+                       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 1b42f2c7b..3223e1303 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -60,9 +60,9 @@
  */
 _CONST char *
 _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
-                                      struct _reent *rptr _AND
-                                      _CONST char *file   _AND
-                                      _CONST char *dir    _AND
+                                      struct _reent *rptr,
+                                      _CONST char *file,
+                                      _CONST char *dir,
                                       _CONST char *ext)
 {
   int len1, len2, len3;
@@ -115,7 +115,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
  */
 int
 _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
-                                  iconv_t cd _AND
+                                  iconv_t cd,
                                   int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -138,7 +138,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
  */
 int
 _DEFUN(_iconv_nls_is_stateful, (cd, direction),
-                               iconv_t cd _AND
+                               iconv_t cd,
                                int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -167,11 +167,11 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
  */
 size_t
 _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                        struct _reent *rptr _AND
-                        iconv_t cd          _AND
-                        _CONST char **inbuf _AND
-                        size_t *inbytesleft _AND
-                        char **outbuf       _AND
+                        struct _reent *rptr,
+                        iconv_t cd,
+                        _CONST char **inbuf,
+                        size_t *inbytesleft,
+                        char **outbuf,
                         size_t *outbytesleft)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -221,8 +221,8 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
  */
 _VOID
 _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
-                             iconv_t cd    _AND
-                             mbstate_t *ps _AND
+                             iconv_t cd,
+                             mbstate_t *ps,
                              int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -248,8 +248,8 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
  */
 int
 _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
-                             iconv_t cd    _AND
-                             mbstate_t *ps _AND
+                             iconv_t cd,
+                             mbstate_t *ps,
                              int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -260,8 +260,8 @@ _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 _AND
-                     _CONST char *to     _AND
+                     struct _reent *rptr,
+                     _CONST char *to,
                      _CONST char *from)
 {
   iconv_conversion_t *ic;
@@ -317,10 +317,10 @@ _DEFUN(iconv_open1, (rptr, to, from),
  */
 int
 _DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
-                        struct _reent *rptr   _AND
-                        _CONST char *encoding _AND
-                        iconv_t *tomb         _AND
-                        iconv_t *towc         _AND
+                        struct _reent *rptr,
+                        _CONST char *encoding,
+                        iconv_t *tomb,
+                        iconv_t *towc,
                         int flag)
 {
   _CONST char *wchar_encoding;
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index d35027f9c..7ddbc77bd 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -37,8 +37,8 @@ static int null_conversion_dummy_data;
 
 static _VOID_PTR
 _DEFUN(null_conversion_open, (rptr, to, from),
-                             struct _reent *rptr _AND
-                             _CONST char *to     _AND
+                             struct _reent *rptr,
+                             _CONST char *to,
                              _CONST char *from)
 {
   return (_VOID_PTR)&null_conversion_dummy_data;
@@ -47,7 +47,7 @@ _DEFUN(null_conversion_open, (rptr, to, from),
 
 static size_t
 _DEFUN(null_conversion_close, (rptr, data),
-                              struct _reent *rptr _AND
+                              struct _reent *rptr,
                               _VOID_PTR data)
 {
   return 0;
@@ -57,12 +57,12 @@ _DEFUN(null_conversion_close, (rptr, data),
 static size_t
 _DEFUN(null_conversion_convert,
                      (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
-                     struct _reent *rptr          _AND
-                     _VOID_PTR data               _AND
-                     _CONST unsigned char **inbuf _AND
-                     size_t *inbytesleft          _AND
-                     unsigned char **outbuf       _AND
-                     size_t *outbytesleft         _AND
+                     struct _reent *rptr,
+                     _VOID_PTR data,
+                     _CONST unsigned char **inbuf,
+                     size_t *inbytesleft,
+                     unsigned char **outbuf,
+                     size_t *outbytesleft,
                      int flags)
 {
   size_t result;
@@ -94,7 +94,7 @@ _DEFUN(null_conversion_convert,
 
 static int
 _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
-                                       _VOID_PTR data     _AND
+                                       _VOID_PTR data,
                                        int direction)
 {
   return ICONV_MB_LEN_MAX;
@@ -103,8 +103,8 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
 
 static _VOID
 _DEFUN(null_conversion_get_state, (data, state, size),
-                                  _VOID_PTR data   _AND
-                                  mbstate_t *state _AND
+                                  _VOID_PTR data,
+                                  mbstate_t *state,
                                   int direction)
 {
   return;
@@ -113,8 +113,8 @@ _DEFUN(null_conversion_get_state, (data, state, size),
 
 static int
 _DEFUN(null_conversion_set_state, (data, state, direction),
-                                  _VOID_PTR data   _AND
-                                  mbstate_t *state _AND
+                                  _VOID_PTR data,
+                                  mbstate_t *state,
                                   int direction)
 {
   return 0;
@@ -122,7 +122,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
 
 static int
 _DEFUN(null_conversion_is_stateful, (data, direction),
-                                    _VOID_PTR data _AND
+                                    _VOID_PTR data,
                                     int direction)
 {
   return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index cc5ceb953..46ad33efe 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -46,8 +46,8 @@ _EXFUN(find_encoding_name, (_CONST char *searchee,
 
 static _VOID_PTR
 _DEFUN(ucs_based_conversion_open, (rptr, to, from),
-                                  struct _reent *rptr _AND
-                                  _CONST char *to     _AND
+                                  struct _reent *rptr,
+                                  _CONST char *to,
                                   _CONST char *from)
 {
   iconv_ucs_conversion_t *uc;
@@ -124,7 +124,7 @@ error:
 
 static size_t
 _DEFUN(ucs_based_conversion_close, (rptr, data),
-                                   struct _reent *rptr _AND
+                                   struct _reent *rptr,
                                    _VOID_PTR data)
 {
   iconv_ucs_conversion_t *uc;
@@ -146,12 +146,12 @@ _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          _AND
-                 _VOID_PTR data               _AND
-                 _CONST unsigned char **inbuf _AND
-                 size_t *inbytesleft          _AND
-                 unsigned char **outbuf       _AND
-                 size_t *outbytesleft         _AND
+                 struct _reent *rptr,
+                 _VOID_PTR data,
+                 _CONST unsigned char **inbuf,
+                 size_t *inbytesleft,
+                 unsigned char **outbuf,
+                 size_t *outbytesleft,
                  int flags)
 {
   unsigned char outbuf1[ICONV_MB_LEN_MAX];
@@ -239,7 +239,7 @@ _DEFUN(ucs_based_conversion_convert,
 
 static int
 _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
-                                            _VOID_PTR data _AND
+                                            _VOID_PTR data,
                                             int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -253,8 +253,8 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
 
 static _VOID
 _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
-                                       _VOID_PTR data   _AND
-                                       mbstate_t *state _AND
+                                       _VOID_PTR data,
+                                       mbstate_t *state,
                                        int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -281,8 +281,8 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
 
 static int
 _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
-                                       _VOID_PTR data   _AND
-                                       mbstate_t *state _AND
+                                       _VOID_PTR data,
+                                       mbstate_t *state,
                                        int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -303,7 +303,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
 
 static int
 _DEFUN(ucs_based_conversion_is_stateful, (data, direction),
-                                         _VOID_PTR data _AND
+                                         _VOID_PTR data,
                                          int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -343,7 +343,7 @@ _iconv_ucs_conversion_handlers =
 
 static int
 _DEFUN(find_encoding_name, (searchee, names),
-                           _CONST char *searchee _AND
+                           _CONST char *searchee,
                            _CONST char **names)
 {
   _CONST char *p;
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 5fb990700..fc832fc40 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -48,7 +48,6 @@
 
 #ifdef _HAVE_STDC
 #define _PTR void *
-#define _AND ,
 #define _NOARGS void
 #define _CONST const
 #define _VOLATILE volatile
@@ -77,7 +76,6 @@
 #endif
 #else
 #define _PTR char *
-#define _AND ;
 #define _NOARGS
 #define _CONST
 #define _VOLATILE
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 073189a29..87cb04b35 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -290,8 +290,8 @@ static char *currentlocale (void);
 
 char *
 _DEFUN(_setlocale_r, (p, category, locale),
-       struct _reent *p _AND
-       int category _AND
+       struct _reent *p,
+       int category,
        _CONST char *locale)
 {
 #ifndef _MB_CAPABLE
@@ -991,7 +991,7 @@ __locale_ctype_ptr (void)
 
 char *
 _DEFUN (setlocale, (category, locale),
- int category _AND
+ int category,
  _CONST char *locale)
 {
   return _setlocale_r (_REENT, category, locale);
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index fc7dc2143..a2751af85 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -82,7 +82,7 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
  _CONST char *s2)
 {
 
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index 44ba382c7..e0e1d7760 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -82,7 +82,7 @@ QUICKREF
 
 char*
 _DEFUN (strcpy, (dst0, src0),
- char *__restrict dst0 _AND
+ char *__restrict dst0,
  _CONST char *__restrict src0)
 {
 
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index 30379c579..5115c85e2 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -63,7 +63,7 @@ PORTABILITY
 
 __int16_t
 _DEFUN (_atosfix16_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
  _CONST char *s)
 {
   return _strtosfix16_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index dbcac7e2f..49f4cce20 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -9,7 +9,7 @@
 
 __int32_t
 _DEFUN (_atosfix32_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
  _CONST char *s)
 {
   return _strtosfix32_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index 109baf7b6..b433778e7 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -9,7 +9,7 @@
 
 __int64_t
 _DEFUN (_atosfix64_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
  _CONST char *s)
 {
   return _strtosfix64_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 45d130fac..5148acb7d 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -63,7 +63,7 @@ PORTABILITY
 
 __uint16_t
 _DEFUN (_atoufix16_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
  _CONST char *s)
 {
   return _strtoufix16_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index ee29ac586..01919d406 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -9,7 +9,7 @@
 
 __uint32_t
 _DEFUN (_atoufix32_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
  _CONST char *s)
 {
   return _strtoufix32_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index e5eefc423..af71089a6 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -9,7 +9,7 @@
 
 __uint64_t
 _DEFUN (_atoufix64_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
  _CONST char *s)
 {
   return _strtoufix64_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index e39887dc1..84e1171b9 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -93,8 +93,8 @@ PORTABILITY
  */
 __int16_t
 _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
 
 __int16_t
 _DEFUN (strtosfix16, (s, ptr, base),
- _CONST char *s _AND
+ _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 2e22c1458..1b1487b1a 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -14,8 +14,8 @@
  */
 __int32_t
 _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
 
 __int32_t
 _DEFUN (strtosfix32, (s, ptr, base),
- _CONST char *s _AND
+ _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 3006632a4..4ba718c03 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -14,8 +14,8 @@
  */
 __int64_t
 _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
  char **endptr)
 {
   union long_double_union ldbl;
@@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
 
 __int64_t
 _DEFUN (strtosfix64, (s, ptr, base),
- _CONST char *s _AND
+ _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 3bf2d6b29..22de506e3 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -92,8 +92,8 @@ PORTABILITY
  */
 __uint16_t
 _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -161,7 +161,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
 
 __uint16_t
 _DEFUN (strtoufix16, (s, ptr, base),
- _CONST char *s _AND
+ _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 6a8e0812f..05e96675f 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -14,8 +14,8 @@
  */
 __uint32_t
 _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -90,7 +90,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
 
 __uint32_t
 _DEFUN (strtoufix32, (s, ptr, base),
- _CONST char *s _AND
+ _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 539f953a4..5ef53846f 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -14,8 +14,8 @@
  */
 __uint64_t
 _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
  char **endptr)
 {
   union long_double_union ldbl;
@@ -105,7 +105,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
 
 __uint64_t
 _DEFUN (strtoufix64, (s, ptr, base),
- _CONST char *s _AND
+ _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 450e0a352..125ab67fa 100644
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ b/newlib/libc/machine/powerpc/ufix64toa.c
@@ -26,12 +26,12 @@ extern char *_simdldtoa_r _PARAMS((struct _reent *, LONG_DOUBLE_UNION *, int,
 
 char *
 _DEFUN (_ufix64toa_r, (rptr, value, mode, ndigits, decpt, sign, rve),
- struct _reent *rptr _AND
- __uint64_t value _AND
- int mode _AND
- int ndigits _AND
- int *decpt _AND
- int *sign _AND
+ struct _reent *rptr,
+ __uint64_t value,
+ int mode,
+ int ndigits,
+ int *decpt,
+ int *sign,
  char **rve)
 {
   union long_double_union ldbl;
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
index 8b2e835f0..8a10507d3 100644
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ b/newlib/libc/machine/powerpc/vec_calloc.c
@@ -45,7 +45,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _PTR
 _DEFUN (vec_calloc, (n, size),
- size_t n _AND
+ size_t n,
  size_t size)
 {
   return _vec_calloc_r (_REENT, n, size);
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
index e192e399d..7e857b55a 100644
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ b/newlib/libc/machine/powerpc/vec_realloc.c
@@ -8,7 +8,7 @@
 
 _PTR
 _DEFUN (vec_realloc, (ap, nbytes),
- _PTR ap _AND
+ _PTR 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 e0b90fcde..0c1c80e1a 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -272,8 +272,8 @@ static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int,  int
 
 int
 _DEFUN (VFPRINTF, (fp, fmt0, ap),
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ FILE * fp,
+ _CONST char *fmt0,
  va_list ap)
 {
   CHECK_INIT (_REENT, fp);
@@ -282,9 +282,9 @@ _DEFUN (VFPRINTF, (fp, fmt0, ap),
 
 int
 _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data _AND
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ struct _reent *data,
+ FILE * fp,
+ _CONST char *fmt0,
  va_list ap)
 {
  register char *fmt; /* format string */
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index 6cbc624de..b82a14088 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -183,8 +183,8 @@ typedef union
 
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
-    register FILE *__restrict fp _AND
-    _CONST char *__restrict fmt _AND
+    register FILE *__restrict fp,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -204,9 +204,9 @@ __svfscanf (fp, fmt0, ap)
 
 int
 _DEFUN (_vfscanf_r, (data, fp, fmt, ap),
-    struct _reent *data _AND
-    register FILE *__restrict fp _AND
-    _CONST char *__restrict fmt _AND
+    struct _reent *data,
+    register FILE *__restrict fp,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   return __svfscanf_r (data, fp, fmt, ap);
diff --git a/newlib/libc/machine/spu/assert.c b/newlib/libc/machine/spu/assert.c
index f1dd33047..e8028459c 100644
--- a/newlib/libc/machine/spu/assert.c
+++ b/newlib/libc/machine/spu/assert.c
@@ -11,9 +11,9 @@
 /* func can be NULL, in which case no function information is given.  */
 void
 _DEFUN (__assert_func, (file, line, func, failedexpr),
- const char *file _AND
- int line _AND
- const char *func _AND
+ const char *file,
+ int line,
+ const char *func,
  const char *failedexpr)
 {
   fprintf(stderr,
@@ -32,8 +32,8 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
 
 void
 _DEFUN (__assert, (file, line, failedexpr),
- const char *file _AND
- int line _AND
+ const char *file,
+ int line,
  const char *failedexpr)
 {
    __assert_func (file, line, NULL, failedexpr);
diff --git a/newlib/libc/machine/spu/creat.c b/newlib/libc/machine/spu/creat.c
index 3cd714306..0e271c1a7 100644
--- a/newlib/libc/machine/spu/creat.c
+++ b/newlib/libc/machine/spu/creat.c
@@ -8,7 +8,7 @@
 
 int
 _DEFUN(creat, (path, mode),
-       const char *path _AND
+       const char *path,
        mode_t mode)
 {
   return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index a795db8b5..b09ffad16 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Just a stub for now.  */
 FILE *
 _DEFUN (fdopen, (fd, mode),
-        int fd _AND
+        int fd,
         _CONST char *mode)
 {
   errno = ENOSYS;
diff --git a/newlib/libc/machine/spu/fgetpos.c b/newlib/libc/machine/spu/fgetpos.c
index 694400e48..bb7d780ea 100644
--- a/newlib/libc/machine/spu/fgetpos.c
+++ b/newlib/libc/machine/spu/fgetpos.c
@@ -45,7 +45,7 @@ typedef struct
 
 int
 _DEFUN (fgetpos, (fp, pos),
- FILE *__restrict fp _AND
+ 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 2b0ca417e..8f2a9785f 100644
--- a/newlib/libc/machine/spu/fgets.c
+++ b/newlib/libc/machine/spu/fgets.c
@@ -47,8 +47,8 @@ typedef struct
 
 char *
 _DEFUN (fgets, (buf, n, fp),
- char *__restrict buf _AND
- int n _AND
+ char *__restrict buf,
+ int n,
  FILE *__restrict fp)
 {
   c99_fgets_t args;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index 821d7c201..c41d33510 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -46,7 +46,7 @@ typedef struct
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN (fopen, (file, mode),
- _CONST char *__restrict file _AND
+ _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 9ed796894..8cf84bb6e 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -47,7 +47,7 @@ typedef struct
 
 int
 _DEFUN (fputs, (s, fp),
- char _CONST *__restrict s _AND
+ 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 eb3966c19..3ea24cc4a 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -50,9 +50,9 @@ typedef struct
 
 size_t
 _DEFUN (fread, (buf, size, count, fp),
- _PTR __restrict  buf _AND
- size_t size _AND
- size_t count _AND
+ _PTR __restrict  buf,
+ size_t size,
+ size_t count,
  FILE *__restrict fp)
 {
   c99_fread_t args;
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 53dd2bc1d..7c52abef3 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -48,8 +48,8 @@ typedef struct
 
 FILE *
 _DEFUN (freopen, (file, mode, fp),
- const char *__restrict file _AND
- const char *__restrict mode _AND
+ const char *__restrict file,
+ const char *__restrict mode,
  FILE *__restrict fp)
 {
   int ret;
diff --git a/newlib/libc/machine/spu/fseek.c b/newlib/libc/machine/spu/fseek.c
index dc7453325..136d5c639 100644
--- a/newlib/libc/machine/spu/fseek.c
+++ b/newlib/libc/machine/spu/fseek.c
@@ -48,8 +48,8 @@ typedef struct
 
 int
 _DEFUN (fseek, (fp, offset, whence),
-     register FILE *fp _AND
-     long offset _AND
+     register FILE *fp,
+     long offset,
      int whence)
 {
   c99_fseek_t args;
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index 3bd0dde3d..1ebbb8f63 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -46,7 +46,7 @@ typedef struct
 
 int
 _DEFUN (fsetpos, (iop, pos),
- FILE * iop _AND
+ FILE * iop,
  _CONST _fpos_t * pos)
 {
   c99_fsetpos_t args;
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 58aab9f0a..6de571069 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -50,9 +50,9 @@ typedef struct
 
 size_t
 _DEFUN (fwrite, (buf, size, count, fp),
- _CONST _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ _CONST _PTR __restrict buf,
+ size_t size,
+ size_t count,
  FILE * fp)
 {
   c99_fwrite_t args;
diff --git a/newlib/libc/machine/spu/setbuf.c b/newlib/libc/machine/spu/setbuf.c
index 84430fc73..c942bb9a9 100644
--- a/newlib/libc/machine/spu/setbuf.c
+++ b/newlib/libc/machine/spu/setbuf.c
@@ -47,7 +47,7 @@ typedef struct
 
 void
 _DEFUN (setbuf, (fp, buf),
- FILE *__restrict fp _AND
+ 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 32da292f9..a045cc37b 100644
--- a/newlib/libc/machine/spu/setvbuf.c
+++ b/newlib/libc/machine/spu/setvbuf.c
@@ -51,9 +51,9 @@ typedef struct
 
 int
 _DEFUN (setvbuf, (fp, buf, mode, size),
- FILE * fp _AND
- char *buf _AND
- int mode _AND
+ FILE * fp,
+ char *buf,
+ int mode,
  size_t size)
 {
   c99_setvbuf_t args;
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index 128d0b3eb..e5ef2fa9f 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vfprintf, (fp, fmt0, ap),
- FILE *__restrict fp _AND
- _CONST char *__restrict fmt0 _AND
+ FILE *__restrict fp,
+ _CONST char *__restrict fmt0,
  va_list ap)
 {
   c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index 0f728969f..a497b7ba3 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
-    FILE *__restrict fp _AND
-    _CONST char *__restrict fmt _AND
+    FILE *__restrict fp,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 32b86d8f2..35b12dfb5 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -24,7 +24,7 @@ typedef struct
 
 int
 _DEFUN (vprintf, (fmt, ap),
-     _CONST char *fmt _AND
+     _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 4f68bfefd..29b4948dd 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -56,7 +56,7 @@ typedef struct
 
 int
 _DEFUN (vscanf, (fmt, ap),
-     _CONST char *fmt _AND
+     _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 cf4f5e709..f952b84c1 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -28,9 +28,9 @@ typedef struct
 
 int
 _DEFUN (vsnprintf, (str, size, fmt, ap),
-     char *__restrict str _AND
-     size_t size _AND
-     _CONST char *__restrict fmt _AND
+     char *__restrict str,
+     size_t size,
+     _CONST char *__restrict fmt,
      va_list ap)
 {
   c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 0719d38f5..1a44de479 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -27,8 +27,8 @@ typedef struct
 
 int
 _DEFUN (vsprintf, (str, fmt, ap),
-     char *__restrict str _AND
-     _CONST char *__restrict fmt _AND
+     char *__restrict str,
+     _CONST char *__restrict fmt,
      va_list ap)
 {
   c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 2f7380ff4..38ee1f4b9 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vsscanf, (str, fmt, ap),
-    _CONST char *__restrict str _AND
-    _CONST char *__restrict fmt _AND
+    _CONST char *__restrict str,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   c99_vsscanf_t args;
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index eba45eaaa..6026d195c 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -178,8 +178,8 @@ parse_number (s, p)
 
 static long
 _DEFUN(get_number, (s, size, unsigned_p),
-     char *s _AND
-     long size _AND
+     char *s,
+     long size,
      int unsigned_p)
 {
   long x;
@@ -221,8 +221,8 @@ _DEFUN(get_number, (s, size, unsigned_p),
 
 static void
 _DEFUN(print_number, (base, unsigned_p, n),
-     int base _AND
-     int unsigned_p _AND
+     int base,
+     int unsigned_p,
      long n)
 {
   static char chars[16] = "0123456789abcdef";
diff --git a/newlib/libc/posix/creat.c b/newlib/libc/posix/creat.c
index b8a4f9a14..116f26ce3 100644
--- a/newlib/libc/posix/creat.c
+++ b/newlib/libc/posix/creat.c
@@ -6,7 +6,7 @@
 
 int
 _DEFUN(creat, (path, mode),
-       const char *path _AND
+       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 ebb97fb9b..beb48c6ae 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -19,7 +19,7 @@ static char ***p_environ = &environ;
 
 int
 _DEFUN(execl, (path, arg0, ...),
-      _CONST char *path _AND
+      _CONST char *path,
       _CONST char *arg0 _DOTS)
 
 #else
@@ -28,8 +28,8 @@ _DEFUN(execl, (path, arg0, ...),
 
 int
 _DEFUN(execl, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
+     _CONST char *path,
+     _CONST char *arg0,
      va_dcl)
 
 #endif
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index 2b22036a1..f4c759250 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -14,7 +14,7 @@
 
 int
 _DEFUN(execle, (path, arg0, ...),
-      _CONST char *path _AND
+      _CONST char *path,
       _CONST char *arg0 _DOTS)
 
 #else
@@ -23,8 +23,8 @@ _DEFUN(execle, (path, arg0, ...),
 
 int
 _DEFUN(execle, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
+     _CONST char *path,
+     _CONST char *arg0,
      va_dcl)
 
 #endif
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 6212da629..6731bb905 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -14,7 +14,7 @@
 
 int
 _DEFUN(execlp, (path, arg0, ...),
-      _CONST char *path _AND
+      _CONST char *path,
       _CONST char *arg0 _DOTS)
 
 #else
@@ -23,8 +23,8 @@ _DEFUN(execlp, (path, arg0, ...),
 
 int
 _DEFUN(execlp, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
+     _CONST char *path,
+     _CONST char *arg0,
      va_dcl)
 
 #endif
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 8793e2ec4..049a5381d 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -15,7 +15,7 @@ static char ***p_environ = &environ;
 
 int
 _DEFUN (execv, (path, argv),
- const char *path _AND
+ 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 d1355133a..c2a2144f5 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -11,8 +11,8 @@
 
 int
 _DEFUN(execve, (path, argv, envp),
-      const char *path _AND
-      char * const argv[] _AND
+      const char *path,
+      char * const argv[],
       char * const envp[])
 {
   return _execve (path, argv, envp);
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index 64310f661..db7e03456 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -22,8 +22,8 @@
 
 static char *
 _DEFUN (strccpy, (s1, s2, c),
- char *s1 _AND
- char *s2 _AND
+ char *s1,
+ char *s2,
  char c)
 {
   char *dest = s1;
@@ -37,7 +37,7 @@ _DEFUN (strccpy, (s1, s2, c),
 
 int
 _DEFUN (execvp, (file, argv),
- _CONST char *file _AND
+ _CONST char *file,
  char * _CONST argv[])
 {
   char *path = getenv ("PATH");
diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c
index f9abfac3f..bbd0fc424 100644
--- a/newlib/libc/posix/popen.c
+++ b/newlib/libc/posix/popen.c
@@ -110,7 +110,7 @@ static struct pid {
 
 FILE *
 _DEFUN(popen, (program, type),
- const char *program _AND
+ const char *program,
  const char *type)
 {
  struct pid *cur;
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index 61d36304d..8e54de7fa 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -295,11 +295,11 @@ do_posix_spawn(pid_t *pid, _CONST char *path,
 
 int
 _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
- pid_t *pid _AND
- _CONST char *path _AND
- _CONST posix_spawn_file_actions_t *fa _AND
- _CONST posix_spawnattr_t *sa _AND
- char * _CONST argv[] _AND
+ pid_t *pid,
+ _CONST char *path,
+ _CONST posix_spawn_file_actions_t *fa,
+ _CONST posix_spawnattr_t *sa,
+ char * _CONST argv[],
  char * _CONST envp[])
 {
  return do_posix_spawn(pid, path, fa, sa, argv, envp, 0);
@@ -307,11 +307,11 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
 
 int
 _DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
- pid_t *pid _AND
- _CONST char *path _AND
- _CONST posix_spawn_file_actions_t *fa _AND
- _CONST posix_spawnattr_t *sa _AND
- char * _CONST argv[] _AND
+ pid_t *pid,
+ _CONST char *path,
+ _CONST posix_spawn_file_actions_t *fa,
+ _CONST posix_spawnattr_t *sa,
+ char * _CONST argv[],
  char * _CONST envp[])
 {
  return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
@@ -358,10 +358,10 @@ _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 _AND
- int fildes _AND
- _CONST char * __restrict path _AND
- int oflag _AND
+ posix_spawn_file_actions_t * __restrict fa,
+ int fildes,
+ _CONST char * __restrict path,
+ int oflag,
  mode_t mode)
 {
  posix_spawn_file_actions_entry_t *fae;
@@ -393,8 +393,8 @@ _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 _AND
- int fildes _AND
+ posix_spawn_file_actions_t *fa,
+ int fildes,
  int newfildes)
 {
  posix_spawn_file_actions_entry_t *fae;
@@ -418,7 +418,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 _AND
+ posix_spawn_file_actions_t *fa,
  int fildes)
 {
  posix_spawn_file_actions_entry_t *fae;
@@ -468,7 +468,7 @@ _DEFUN(posix_spawnattr_destroy, (sa),
 
 int
 _DEFUN(posix_spawnattr_getflags, (sa, flags),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
  short * __restrict flags)
 {
  *flags = (*sa)->sa_flags;
@@ -477,7 +477,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
 
 int
 _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
  pid_t * __restrict pgroup)
 {
  *pgroup = (*sa)->sa_pgroup;
@@ -486,7 +486,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
 
 int
 _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
  struct sched_param * __restrict schedparam)
 {
  *schedparam = (*sa)->sa_schedparam;
@@ -495,7 +495,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
 
 int
 _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
  int * __restrict schedpolicy)
 {
  *schedpolicy = (*sa)->sa_schedpolicy;
@@ -504,7 +504,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
 
 int
 _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
  sigset_t * __restrict sigdefault)
 {
  *sigdefault = (*sa)->sa_sigdefault;
@@ -513,7 +513,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
 
 int
 _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
  sigset_t * __restrict sigmask)
 {
  *sigmask = (*sa)->sa_sigmask;
@@ -522,7 +522,7 @@ _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
 
 int
 _DEFUN(posix_spawnattr_setflags, (sa, flags),
- posix_spawnattr_t *sa _AND
+ posix_spawnattr_t *sa,
  short flags)
 {
  (*sa)->sa_flags = flags;
@@ -531,7 +531,7 @@ _DEFUN(posix_spawnattr_setflags, (sa, flags),
 
 int
 _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
- posix_spawnattr_t *sa _AND
+ posix_spawnattr_t *sa,
  pid_t pgroup)
 {
  (*sa)->sa_pgroup = pgroup;
@@ -540,7 +540,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
 
 int
 _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
- posix_spawnattr_t * __restrict sa _AND
+ posix_spawnattr_t * __restrict sa,
  _CONST struct sched_param * __restrict schedparam)
 {
  (*sa)->sa_schedparam = *schedparam;
@@ -549,7 +549,7 @@ _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
 
 int
 _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
- posix_spawnattr_t *sa _AND
+ posix_spawnattr_t *sa,
  int schedpolicy)
 {
  (*sa)->sa_schedpolicy = schedpolicy;
@@ -558,7 +558,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
 
 int
 _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
- posix_spawnattr_t * __restrict sa _AND
+ posix_spawnattr_t * __restrict sa,
  _CONST sigset_t * __restrict sigdefault)
 {
  (*sa)->sa_sigdefault = *sigdefault;
@@ -567,7 +567,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
 
 int
 _DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
- posix_spawnattr_t * __restrict sa _AND
+ posix_spawnattr_t * __restrict sa,
  _CONST sigset_t * __restrict sigmask)
 {
  (*sa)->sa_sigmask = *sigmask;
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
index d13775b87..a75eee9a3 100644
--- a/newlib/libc/posix/readdir_r.c
+++ b/newlib/libc/posix/readdir_r.c
@@ -51,8 +51,8 @@ extern int getdents (int fd, void *dp, int count);
  */
 int
 _DEFUN(readdir_r, (dirp, dp, dpp),
- register DIR *__restrict dirp _AND
- struct dirent *__restrict dp _AND
+ register DIR *__restrict dirp,
+ struct dirent *__restrict dp,
  struct dirent **__restrict dpp) {
 
 struct dirent *tmpdp;
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 8cb8ff82d..0ffe68971 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -69,9 +69,9 @@ static char sccsid[] = "@(#)scandir.c 5.10 (Berkeley) 2/23/91";
 
 int
 _DEFUN(scandir, (dirname, namelist, select, dcomp),
- const char *dirname _AND
- struct dirent ***namelist _AND
- int (*select) __P((const struct dirent *)) _AND
+ const char *dirname,
+ struct dirent ***namelist,
+ int (*select) __P((const struct dirent *)),
  int (*dcomp) __P((const struct dirent **, const struct dirent **)))
 {
  register struct dirent *d, *p, **names;
@@ -170,7 +170,7 @@ cleanup:
  */
 int
 _DEFUN(alphasort, (d1, d2),
-       const struct dirent **d1 _AND
+       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 3965edabf..f876d7075 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)seekdir.c 5.7 (Berkeley) 6/1/90";
  */
 void
 _DEFUN(seekdir, (dirp, loc),
- DIR *dirp _AND
+ DIR *dirp,
  long loc)
 {
 #ifdef HAVE_DD_LOCK
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index 959e3b7bb..9c945fcf7 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -120,7 +120,7 @@ _DEFUN(telldir, (dirp),
  */
 void
 _DEFUN(_seekdir, (dirp, loc),
- register DIR *dirp _AND
+ register DIR *dirp,
  long loc)
 {
  register struct ddloc *lp;
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 559ca030a..cb78fba76 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -46,9 +46,9 @@ DESCRIPTION
 
 int
 _DEFUN (_execve_r, (ptr, name, argv, env),
-     struct _reent *ptr _AND
-     _CONST char *name _AND
-     char *_CONST argv[] _AND
+     struct _reent *ptr,
+     _CONST char *name,
+     char *_CONST argv[],
      char *_CONST env[])
 {
   int ret;
@@ -114,7 +114,7 @@ DESCRIPTION
 
 int
 _DEFUN (_wait_r, (ptr, status),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      int *status)
 {
   int ret;
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
index 328b9de13..fdfe41090 100644
--- a/newlib/libc/reent/fcntlr.c
+++ b/newlib/libc/reent/fcntlr.c
@@ -41,9 +41,9 @@ DESCRIPTION
 
 int
 _DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
-     struct _reent *ptr _AND
-     int fd _AND
-     int cmd _AND
+     struct _reent *ptr,
+     int fd,
+     int cmd,
      int arg)
 {
   int ret;
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
index d9fa8b71f..06a89a5c8 100644
--- a/newlib/libc/reent/fstat64r.c
+++ b/newlib/libc/reent/fstat64r.c
@@ -48,8 +48,8 @@ DESCRIPTION
 
 int
 _DEFUN (_fstat64_r, (ptr, fd, pstat),
-     struct _reent *ptr _AND
-     int fd _AND
+     struct _reent *ptr,
+     int fd,
      struct stat64 *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/gettimeofdayr.c b/newlib/libc/reent/gettimeofdayr.c
index 007dff8da..80942afb0 100644
--- a/newlib/libc/reent/gettimeofdayr.c
+++ b/newlib/libc/reent/gettimeofdayr.c
@@ -53,8 +53,8 @@ DESCRIPTION
 
 int
 _DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
-     struct _reent *ptr _AND
-     struct timeval *ptimeval _AND
+     struct _reent *ptr,
+     struct timeval *ptimeval,
      void *ptimezone)
 {
   int ret;
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 8cfdf2f06..59113d26e 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -44,8 +44,8 @@ DESCRIPTION
 
 int
 _DEFUN (_link_r, (ptr, old, new),
-     struct _reent *ptr _AND
-     _CONST char *old _AND
+     struct _reent *ptr,
+     _CONST char *old,
      _CONST char *new)
 {
   int ret;
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
index 1241a27e4..2f16f0bca 100644
--- a/newlib/libc/reent/lseek64r.c
+++ b/newlib/libc/reent/lseek64r.c
@@ -42,9 +42,9 @@ DESCRIPTION
 
 _off64_t
 _DEFUN (_lseek64_r, (ptr, fd, pos, whence),
-     struct _reent *ptr _AND
-     int fd _AND
-     _off64_t pos _AND
+     struct _reent *ptr,
+     int fd,
+     _off64_t pos,
      int whence)
 {
   _off64_t ret;
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index cc73ab467..639158912 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -39,9 +39,9 @@ DESCRIPTION
 
 _off_t
 _DEFUN (_lseek_r, (ptr, fd, pos, whence),
-     struct _reent *ptr _AND
-     int fd _AND
-     _off_t pos _AND
+     struct _reent *ptr,
+     int fd,
+     _off_t pos,
      int whence)
 {
   _off_t ret;
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index eee999e19..4c2c94f9c 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -41,8 +41,8 @@ DESCRIPTION
 
 int
 _DEFUN (_mkdir_r, (ptr, path, mode),
-     struct _reent *ptr _AND
-     _CONST char *path _AND
+     struct _reent *ptr,
+     _CONST char *path,
      int mode)
 {
   int ret;
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index 06b203b81..f38ff8458 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -40,9 +40,9 @@ DESCRIPTION
 
 int
 _DEFUN (_open_r, (ptr, file, flags, mode),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
-     int flags _AND
+     struct _reent *ptr,
+     _CONST char *file,
+     int flags,
      int mode)
 {
   int ret;
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index 65e0514cf..edc6fd08b 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -39,9 +39,9 @@ DESCRIPTION
 
 _ssize_t
 _DEFUN (_read_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr _AND
-     int fd _AND
-     _PTR buf _AND
+     struct _reent *ptr,
+     int fd,
+     _PTR buf,
      size_t cnt)
 {
   _ssize_t ret;
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index b6c2abf02..a98c3110c 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -31,7 +31,7 @@ int errno;
 
 void
 _DEFUN (cleanup_glue, (ptr, glue),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      struct _glue *glue)
 {
   /* Have to reclaim these in reverse order: */
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index 9b42dc380..e55c2f291 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -41,8 +41,8 @@ DESCRIPTION
 
 int
 _DEFUN (_rename_r, (ptr, old, new),
-     struct _reent *ptr _AND
-     _CONST char *old _AND
+     struct _reent *ptr,
+     _CONST char *old,
      _CONST char *new)
 {
   int ret = 0;
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index 4217174b3..0bc4163c1 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -42,7 +42,7 @@ DESCRIPTION
 
 void *
 _DEFUN (_sbrk_r, (ptr, incr),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      ptrdiff_t incr)
 {
   char *ret;
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 95dd49ed3..9229061d5 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -44,8 +44,8 @@ DESCRIPTION
 
 int
 _DEFUN (_kill_r, (ptr, pid, sig),
-     struct _reent *ptr _AND
-     int pid _AND
+     struct _reent *ptr,
+     int pid,
      int sig)
 {
   int ret;
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 1f175e0a9..134ca82ef 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -46,8 +46,8 @@ DESCRIPTION
 
 int
 _DEFUN (_stat64_r, (ptr, file, pstat),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
+     struct _reent *ptr,
+     _CONST char *file,
      struct stat64 *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 3500c88b1..2b271e10f 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -46,8 +46,8 @@ DESCRIPTION
 
 int
 _DEFUN (_stat_r, (ptr, file, pstat),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
+     struct _reent *ptr,
+     _CONST char *file,
      struct stat *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/timesr.c b/newlib/libc/reent/timesr.c
index efb98b61d..dbe6a4ef0 100644
--- a/newlib/libc/reent/timesr.c
+++ b/newlib/libc/reent/timesr.c
@@ -45,7 +45,7 @@ DESCRIPTION
 
 clock_t
 _DEFUN (_times_r, (ptr, ptms),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      struct tms *ptms)
 {
   clock_t ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index 53b8f11e3..eb000be15 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -39,7 +39,7 @@ DESCRIPTION
 
 int
 _DEFUN (_unlink_r, (ptr, file),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      _CONST char *file)
 {
   int ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 4190a9059..4e06d74ef 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -39,9 +39,9 @@ DESCRIPTION
 
 _ssize_t
 _DEFUN (_write_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
+     struct _reent *ptr,
+     int fd,
+     _CONST _PTR buf,
      size_t cnt)
 {
   _ssize_t ret;
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 579633c12..c15ea64d2 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -57,10 +57,10 @@ No supporting OS subroutines are required.
 
 _PTR
 _DEFUN (bsearch, (key, base, nmemb, size, compar),
- _CONST _PTR key _AND
- _CONST _PTR base _AND
- size_t nmemb _AND
- size_t size _AND
+ _CONST _PTR key,
+ _CONST _PTR base,
+ size_t nmemb,
+ size_t size,
  int _EXFNPTR(compar, (const _PTR, const _PTR)))
 {
   _PTR current;
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index 5fea88a82..f20322c42 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.c
@@ -105,10 +105,10 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
 
 extern DB *
 _DEFUN(__hash_open, (file, flags, mode, info, dflags),
- const char *file _AND
- int flags _AND
- int mode _AND
- int dflags _AND
+ const char *file,
+ int flags,
+ int mode,
+ int dflags,
  const HASHINFO *info) /* Special directives for create */
 {
  HTAB *hashp;
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index b7be1cd6f..800211689 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -70,7 +70,7 @@ _DEFUN_VOID (hdestroy)
 
 ENTRY *
 _DEFUN(hsearch, (item, action),
-       ENTRY item _AND
+       ENTRY item,
        ACTION action)
 {
   ENTRY *retval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index 9a8e7fabe..e24a62a55 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -101,9 +101,9 @@ static inline void swapfunc _PARAMS((char *, char *, int, int));
 
 static inline void
 _DEFUN(swapfunc, (a, b, n, swaptype),
- char *a _AND
- char *b _AND
- int n _AND
+ char *a,
+ char *b,
+ int n,
  int swaptype)
 {
  if(swaptype <= 1)
@@ -132,10 +132,10 @@ _DEFUN(swapfunc, (a, b, n, swaptype),
 
 static inline char *
 _DEFUN(med3, (a, b, c, cmp, thunk),
- char *a _AND
- char *b _AND
- char *c _AND
- cmp_t *cmp _AND
+ char *a,
+ char *b,
+ char *c,
+ cmp_t *cmp,
  void *thunk
 #if !defined(I_AM_QSORT_R) && !defined(I_AM_GNU_QSORT_R)
 __unused
@@ -150,26 +150,26 @@ __unused
 #if defined(I_AM_QSORT_R)
 void
 _DEFUN(__bsd_qsort_r, (a, n, es, thunk, cmp),
- void *a _AND
- size_t n _AND
- size_t es _AND
- void *thunk _AND
+ 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 _AND
- size_t n _AND
- size_t es _AND
- cmp_t *cmp _AND
+ void *a,
+ size_t n,
+ size_t es,
+ cmp_t *cmp,
  void *thunk)
 #else
 #define thunk NULL
 void
 _DEFUN(qsort, (a, n, es, cmp),
- void *a _AND
- size_t n _AND
- size_t es _AND
+ void *a,
+ size_t n,
+ size_t es,
  cmp_t *cmp)
 #endif
 {
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
index b607b5421..a0128e98b 100644
--- a/newlib/libc/search/tdelete.c
+++ b/newlib/libc/search/tdelete.c
@@ -27,8 +27,8 @@ __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 _AND /* key to be deleted */
- void      **__restrict vrootp _AND /* address of the root of tree */
+ const void *__restrict vkey, /* key to be deleted */
+ void      **__restrict vrootp, /* address of the root of tree */
  int       (*compar)(const void *, const void *))
 {
  node_t **rootp = (node_t **)vrootp;
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
index 3e7327c4d..e1418207a 100644
--- a/newlib/libc/search/tdestroy.c
+++ b/newlib/libc/search/tdestroy.c
@@ -41,7 +41,7 @@ trecurse(root, free_action)
 
 void
 _DEFUN(tdestroy, (vrootp, freefct),
-       void *vrootp _AND
+       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 5d7c40c93..108213048 100644
--- a/newlib/libc/search/tfind.c
+++ b/newlib/libc/search/tfind.c
@@ -26,8 +26,8 @@ __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 _AND /* key to be found */
- void **vrootp _AND /* address of the tree root */
+ const void *vkey, /* key to be found */
+ void **vrootp, /* address of the tree root */
  int (*compar)(const void *, const void *))
 {
  node_t **rootp = (node_t **)vrootp;
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
index 5f41b407d..8fe265703 100644
--- a/newlib/libc/search/tsearch.c
+++ b/newlib/libc/search/tsearch.c
@@ -26,8 +26,8 @@ __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 _AND /* key to be located */
- void **vrootp _AND /* address of tree root */
+ const void *vkey, /* key to be located */
+ void **vrootp, /* address of tree root */
  int (*compar)(const void *, const void *))
 {
  node_t *q;
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
index 74ad5a615..26d6e97db 100644
--- a/newlib/libc/search/twalk.c
+++ b/newlib/libc/search/twalk.c
@@ -50,7 +50,7 @@ trecurse(root, action, level)
 /* Walk the nodes of a tree */
 void
 _DEFUN(twalk, (vroot, action),
- const void *vroot _AND /* Root of the tree to be walked */
+ 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 f2cfdf3ff..f0c9b6ee6 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -35,7 +35,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _VOID
 _DEFUN(psignal, (sig, s),
-       int sig _AND
+       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 df3ebb50f..6f93686e6 100644
--- a/newlib/libc/signal/raise.c
+++ b/newlib/libc/signal/raise.c
@@ -62,7 +62,7 @@ _DEFUN (raise, (sig),
 
 int
 _DEFUN (_raise_r, (reent, sig),
- struct _reent *reent _AND
+ 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 5729f65e3..806abd888 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -109,8 +109,8 @@ _DEFUN (_init_signal_r, (ptr),
 
 _sig_func_ptr
 _DEFUN (_signal_r, (ptr, sig, func),
- struct _reent *ptr _AND
- int sig _AND
+ struct _reent *ptr,
+ int sig,
  _sig_func_ptr func)
 {
   _sig_func_ptr old_func;
@@ -132,7 +132,7 @@ _DEFUN (_signal_r, (ptr, sig, func),
 
 int
 _DEFUN (_raise_r, (ptr, sig),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      int sig)
 {
   _sig_func_ptr func;
@@ -167,7 +167,7 @@ _DEFUN (_raise_r, (ptr, sig),
 
 int
 _DEFUN (__sigtramp_r, (ptr, sig),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      int sig)
 {
   _sig_func_ptr func;
@@ -206,7 +206,7 @@ _DEFUN (raise, (sig),
 
 _sig_func_ptr
 _DEFUN (signal, (sig, func),
- int sig _AND
+ int sig,
  _sig_func_ptr func)
 {
   return _signal_r (_REENT, sig, func);
diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
index 0c363d5ea..86996737f 100644
--- a/newlib/libc/stdio/asiprintf.c
+++ b/newlib/libc/stdio/asiprintf.c
@@ -26,8 +26,8 @@
 
 int
 _DEFUN(_asiprintf_r, (ptr, strp, fmt),
-       struct _reent *ptr _AND
-       char **strp        _AND
+       struct _reent *ptr,
+       char **strp,
        const char *fmt _DOTS)
 {
   int ret;
@@ -54,7 +54,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
 
 int
 _DEFUN(asiprintf, (strp, fmt),
-       char **strp _AND
+       char **strp,
        const char *fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/asniprintf.c b/newlib/libc/stdio/asniprintf.c
index 16ccfde63..f033f1b6b 100644
--- a/newlib/libc/stdio/asniprintf.c
+++ b/newlib/libc/stdio/asniprintf.c
@@ -15,9 +15,9 @@
 
 char *
 _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
-       struct _reent *ptr _AND
-       char *buf _AND
-       size_t *lenp _AND
+       struct _reent *ptr,
+       char *buf,
+       size_t *lenp,
        const char *fmt _DOTS)
 {
   int ret;
@@ -62,8 +62,8 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
 
 char *
 _DEFUN(asniprintf, (buf, lenp, fmt),
-       char *buf _AND
-       size_t *lenp _AND
+       char *buf,
+       size_t *lenp,
        const char *fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index 2e8d8aabb..e80ca06cb 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -15,9 +15,9 @@
 
 char *
 _DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
-       struct _reent *__restrict ptr _AND
-       char *buf _AND
-       size_t *lenp _AND
+       struct _reent *__restrict ptr,
+       char *buf,
+       size_t *lenp,
        const char *__restrict fmt _DOTS)
 {
   int ret;
@@ -68,8 +68,8 @@ _EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
 
 char *
 _DEFUN(asnprintf, (buf, lenp, fmt),
-       char *__restrict buf _AND
-       size_t *__restrict lenp _AND
+       char *__restrict buf,
+       size_t *__restrict lenp,
        const char *__restrict fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index bf214f9af..1e75174d4 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -26,8 +26,8 @@
 
 int
 _DEFUN(_asprintf_r, (ptr, strp, fmt),
-       struct _reent *ptr _AND
-       char **__restrict strp        _AND
+       struct _reent *ptr,
+       char **__restrict strp,
        const char *__restrict fmt _DOTS)
 {
   int ret;
@@ -60,7 +60,7 @@ _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
 
 int
 _DEFUN(asprintf, (strp, fmt),
-       char **__restrict strp _AND
+       char **__restrict strp,
        const char *__restrict fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
index fde6ea44c..f57cbac81 100644
--- a/newlib/libc/stdio/diprintf.c
+++ b/newlib/libc/stdio/diprintf.c
@@ -50,8 +50,8 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
 
 int
 _DEFUN(_diprintf_r, (ptr, fd, format),
-       struct _reent *ptr _AND
-       int fd _AND
+       struct _reent *ptr,
+       int fd,
        const char *format _DOTS)
 {
   va_list ap;
@@ -67,7 +67,7 @@ _DEFUN(_diprintf_r, (ptr, fd, format),
 
 int
 _DEFUN(diprintf, (fd, format),
-       int fd _AND
+       int fd,
        const char *format _DOTS)
 {
   va_list ap;
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 7389eefaa..831fe208c 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -54,8 +54,8 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
 
 int
 _DEFUN(_dprintf_r, (ptr, fd, format),
-       struct _reent *ptr _AND
-       int fd _AND
+       struct _reent *ptr,
+       int fd,
        const char *__restrict format _DOTS)
 {
  va_list ap;
@@ -77,7 +77,7 @@ _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
 
 int
 _DEFUN(dprintf, (fd, format),
-       int fd _AND
+       int fd,
        const char *__restrict format _DOTS)
 {
   va_list ap;
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 3325a8920..264d2e48f 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -57,7 +57,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
 
 int
 _DEFUN(_fclose_r, (rptr, fp),
-      struct _reent *rptr _AND
+      struct _reent *rptr,
       register FILE * fp)
 {
   int r;
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index e0268ed87..7dda3c359 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -54,8 +54,8 @@ PORTABILITY
 
 FILE *
 _DEFUN(_fdopen_r, (ptr, fd, mode),
-       struct _reent *ptr _AND
-       int fd             _AND
+       struct _reent *ptr,
+       int fd,
        _CONST char *mode)
 {
   register FILE *fp;
@@ -124,7 +124,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
 
 FILE *
 _DEFUN(fdopen, (fd, mode),
-       int fd _AND
+       int fd,
        _CONST char *mode)
 {
   return _fdopen_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index 199acbdc3..18d6d3e74 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -101,7 +101,7 @@ No supporting OS subroutines are required.
    directly from __srefill. */
 int
 _DEFUN(__sflush_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE * fp)
 {
   register unsigned char *p;
@@ -240,7 +240,7 @@ _DEFUN(__sflush_r, (ptr, fp),
    writing. */
 int
 _DEFUN(__sflushw_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE *fp)
 {
   return (fp->_flags & __SWR) ?  __sflush_r (ptr, fp) : 0;
@@ -251,7 +251,7 @@ _DEFUN(__sflushw_r, (ptr, fp),
 
 int
 _DEFUN(_fflush_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE * fp)
 {
   int ret;
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 54322a069..45404d30e 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -86,7 +86,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(_fgetc_r, (ptr, fp),
-       struct _reent * ptr _AND
+       struct _reent * ptr,
        FILE * fp)
 {
   int result;
diff --git a/newlib/libc/stdio/fgetc_u.c b/newlib/libc/stdio/fgetc_u.c
index 5bbd5a549..45ee3b1b5 100644
--- a/newlib/libc/stdio/fgetc_u.c
+++ b/newlib/libc/stdio/fgetc_u.c
@@ -30,7 +30,7 @@
 
 int
 _DEFUN(_fgetc_unlocked_r, (ptr, fp),
-       struct _reent * ptr _AND
+       struct _reent * ptr,
        FILE * fp)
 {
   CHECK_INIT(ptr, fp);
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index 3074526b4..373adfd8e 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -66,8 +66,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN(_fgetpos_r, (ptr, fp, pos),
-       struct _reent * ptr _AND
-       FILE *__restrict fp           _AND
+       struct _reent * ptr,
+       FILE *__restrict fp,
        _fpos_t *__restrict pos)
 {
   *pos = _ftell_r (ptr, fp);
@@ -83,7 +83,7 @@ _DEFUN(_fgetpos_r, (ptr, fp, pos),
 
 int
 _DEFUN(fgetpos, (fp, pos),
-       FILE *__restrict fp _AND
+       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 54097510d..5edeef957 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -95,9 +95,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 char *
 _DEFUN(_fgets_r, (ptr, buf, n, fp),
-       struct _reent * ptr _AND
-       char *__restrict buf _AND
-       int n     _AND
+       struct _reent * ptr,
+       char *__restrict buf,
+       int n,
        FILE *__restrict fp)
 {
   size_t len;
@@ -190,8 +190,8 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
 
 char *
 _DEFUN(fgets, (buf, n, fp),
-       char *__restrict buf _AND
-       int n     _AND
+       char *__restrict buf,
+       int n,
        FILE *__restrict fp)
 {
   return _fgets_r (_REENT, buf, n, fp);
diff --git a/newlib/libc/stdio/fgetwc.c b/newlib/libc/stdio/fgetwc.c
index 07731487d..718b53a16 100644
--- a/newlib/libc/stdio/fgetwc.c
+++ b/newlib/libc/stdio/fgetwc.c
@@ -126,7 +126,7 @@ PORTABILITY
 
 wint_t
 _DEFUN(__fgetwc, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  register FILE *fp)
 {
   wchar_t wc;
@@ -173,7 +173,7 @@ _DEFUN(__fgetwc, (ptr, fp),
 
 wint_t
 _DEFUN(_fgetwc_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  register FILE *fp)
 {
   wint_t r;
diff --git a/newlib/libc/stdio/fgetwc_u.c b/newlib/libc/stdio/fgetwc_u.c
index 4ccd5765c..f3a4fea61 100644
--- a/newlib/libc/stdio/fgetwc_u.c
+++ b/newlib/libc/stdio/fgetwc_u.c
@@ -31,7 +31,7 @@
 
 wint_t
 _DEFUN(_fgetwc_unlocked_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  register FILE *fp)
 {
   ORIENT(fp, 1);
diff --git a/newlib/libc/stdio/fgetws.c b/newlib/libc/stdio/fgetws.c
index 3dbf3ef74..8ca95d170 100644
--- a/newlib/libc/stdio/fgetws.c
+++ b/newlib/libc/stdio/fgetws.c
@@ -100,9 +100,9 @@ PORTABILITY
 
 wchar_t *
 _DEFUN(_fgetws_r, (ptr, ws, n, fp),
- struct _reent *ptr _AND
- wchar_t * ws _AND
- int n _AND
+ struct _reent *ptr,
+ wchar_t * ws,
+ int n,
  FILE * fp)
 {
   wchar_t *wsp;
@@ -173,8 +173,8 @@ error:
 
 wchar_t *
 _DEFUN(fgetws, (ws, n, fp),
- wchar_t *__restrict ws _AND
- int n _AND
+ wchar_t *__restrict ws,
+ int n,
  FILE *__restrict fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 737bde102..3d928c15d 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -45,8 +45,8 @@ _NOINLINE_STATIC _VOID
 static _VOID
 #endif
 _DEFUN(std, (ptr, flags, file),
-            FILE *ptr _AND
-            int flags _AND
+            FILE *ptr,
+            int flags,
             int file)
 {
   ptr->_p = 0;
@@ -125,7 +125,7 @@ struct glue_with_file {
 
 struct _glue *
 _DEFUN(__sfmoreglue, (d, n),
-       struct _reent *d _AND
+       struct _reent *d,
        register int n)
 {
   struct glue_with_file *g;
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index 7d417f88c..1510556b2 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -23,8 +23,8 @@
 
 int
 _DEFUN(_fiprintf_r, (ptr, fp, fmt),
-       struct _reent *ptr _AND
-       FILE * fp _AND
+       struct _reent *ptr,
+       FILE * fp,
        const char *fmt _DOTS)
 {
   int ret;
@@ -40,7 +40,7 @@ _DEFUN(_fiprintf_r, (ptr, fp, fmt),
 
 int
 _DEFUN(fiprintf, (fp, fmt),
-       FILE * fp _AND
+       FILE * fp,
        const char *fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/flags.c b/newlib/libc/stdio/flags.c
index 518cc33f1..b8f660ec4 100644
--- a/newlib/libc/stdio/flags.c
+++ b/newlib/libc/stdio/flags.c
@@ -31,8 +31,8 @@
 
 int
 _DEFUN(__sflags, (ptr, mode, optr),
-       struct _reent *ptr  _AND
-       register char *mode _AND
+       struct _reent *ptr,
+       register char *mode,
        int *optr)
 {
   register int ret, m, o;
diff --git a/newlib/libc/stdio/fmemopen.c b/newlib/libc/stdio/fmemopen.c
index 520ba1b80..6a6153fbd 100644
--- a/newlib/libc/stdio/fmemopen.c
+++ b/newlib/libc/stdio/fmemopen.c
@@ -84,9 +84,9 @@ typedef struct fmemcookie {
    COOKIE; return number of bytes read (0 on EOF).  */
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(fmemreader, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   fmemcookie *c = (fmemcookie *) cookie;
@@ -104,9 +104,9 @@ _DEFUN(fmemreader, (ptr, cookie, buf, n),
    returning the number of bytes written or EOF on failure.  */
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(fmemwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       const char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   fmemcookie *c = (fmemcookie *) cookie;
@@ -160,9 +160,9 @@ _DEFUN(fmemwriter, (ptr, cookie, buf, n),
    COOKIE; return resulting position or fail with EOF.  */
 static _fpos_t
 _DEFUN(fmemseeker, (ptr, cookie, pos, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos_t pos _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos_t pos,
        int whence)
 {
   fmemcookie *c = (fmemcookie *) cookie;
@@ -215,9 +215,9 @@ _DEFUN(fmemseeker, (ptr, cookie, pos, whence),
 #ifdef __LARGE64_FILES
 static _fpos64_t
 _DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos64_t pos _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos64_t pos,
        int whence)
 {
   _off64_t offset = (_off64_t) pos;
@@ -257,7 +257,7 @@ _DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
 /* Reclaim resources used by stream described by COOKIE.  */
 static int
 _DEFUN(fmemcloser, (ptr, cookie),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        void *cookie)
 {
   fmemcookie *c = (fmemcookie *) cookie;
@@ -269,9 +269,9 @@ _DEFUN(fmemcloser, (ptr, cookie),
    Return the new stream, or fail with NULL.  */
 FILE *
 _DEFUN(_fmemopen_r, (ptr, buf, size, mode),
-       struct _reent *ptr _AND
-       void *__restrict buf _AND
-       size_t size _AND
+       struct _reent *ptr,
+       void *__restrict buf,
+       size_t size,
        const char *__restrict mode)
 {
   FILE *fp;
@@ -362,8 +362,8 @@ _DEFUN(_fmemopen_r, (ptr, buf, size, mode),
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN(fmemopen, (buf, size, mode),
-       void *__restrict buf _AND
-       size_t size _AND
+       void *__restrict buf,
+       size_t size,
        const char *__restrict mode)
 {
   return _fmemopen_r (_REENT, buf, size, mode);
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 2551befed..92ec70670 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -114,8 +114,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 FILE *
 _DEFUN(_fopen_r, (ptr, file, mode),
-       struct _reent *ptr _AND
-       _CONST char *__restrict file _AND
+       struct _reent *ptr,
+       _CONST char *__restrict file,
        _CONST char *__restrict mode)
 {
   register FILE *fp;
@@ -164,7 +164,7 @@ _DEFUN(_fopen_r, (ptr, file, mode),
 
 FILE *
 _DEFUN(fopen, (file, mode),
-       _CONST char *file _AND
+       _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 eb9861392..4ea1ab1d1 100644
--- a/newlib/libc/stdio/fopencookie.c
+++ b/newlib/libc/stdio/fopencookie.c
@@ -99,9 +99,9 @@ typedef struct fccookie {
 
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(fcreader, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   int result;
@@ -114,9 +114,9 @@ _DEFUN(fcreader, (ptr, cookie, buf, n),
 
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(fcwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       const char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   int result;
@@ -137,9 +137,9 @@ _DEFUN(fcwriter, (ptr, cookie, buf, n),
 
 static _fpos_t
 _DEFUN(fcseeker, (ptr, cookie, pos, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos_t pos _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos_t pos,
        int whence)
 {
   fccookie *c = (fccookie *) cookie;
@@ -165,9 +165,9 @@ _DEFUN(fcseeker, (ptr, cookie, pos, whence),
 #ifdef __LARGE64_FILES
 static _fpos64_t
 _DEFUN(fcseeker64, (ptr, cookie, pos, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos64_t pos _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos64_t pos,
        int whence)
 {
   _off64_t offset;
@@ -181,7 +181,7 @@ _DEFUN(fcseeker64, (ptr, cookie, pos, whence),
 
 static int
 _DEFUN(fccloser, (ptr, cookie),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        void *cookie)
 {
   int result = 0;
@@ -198,9 +198,9 @@ _DEFUN(fccloser, (ptr, cookie),
 
 FILE *
 _DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       const char *mode _AND
+       struct _reent *ptr,
+       void *cookie,
+       const char *mode,
        cookie_io_functions_t functions)
 {
   FILE *fp;
@@ -254,8 +254,8 @@ _DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN(fopencookie, (cookie, mode, functions),
-       void *cookie _AND
-       const char *mode _AND
+       void *cookie,
+       const char *mode,
        cookie_io_functions_t functions)
 {
   return _fopencookie_r (_REENT, cookie, mode, functions);
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index fe92a5b99..6a98237a2 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -23,8 +23,8 @@
 
 int
 _DEFUN(_fprintf_r, (ptr, fp, fmt),
-       struct _reent *ptr _AND
-       FILE *__restrict fp _AND
+       struct _reent *ptr,
+       FILE *__restrict fp,
        const char *__restrict fmt _DOTS)
 {
   int ret;
@@ -46,7 +46,7 @@ _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
 
 int
 _DEFUN(fprintf, (fp, fmt),
-       FILE *__restrict fp _AND
+       FILE *__restrict fp,
        const char *__restrict fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/fpurge.c b/newlib/libc/stdio/fpurge.c
index de621feb6..acd177a69 100644
--- a/newlib/libc/stdio/fpurge.c
+++ b/newlib/libc/stdio/fpurge.c
@@ -61,7 +61,7 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN(_fpurge_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE * fp)
 {
   int t;
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index f9273d6ae..452bb2961 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -88,8 +88,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(_fputc_r, (ptr, ch, file),
-       struct _reent *ptr _AND
-       int ch _AND
+       struct _reent *ptr,
+       int ch,
        FILE * file)
 {
   int result;
@@ -103,7 +103,7 @@ _DEFUN(_fputc_r, (ptr, ch, file),
 #ifndef _REENT_ONLY
 int
 _DEFUN(fputc, (ch, file),
-       int ch _AND
+       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 ac64b0bc2..27690e213 100644
--- a/newlib/libc/stdio/fputc_u.c
+++ b/newlib/libc/stdio/fputc_u.c
@@ -30,8 +30,8 @@
 
 int
 _DEFUN(_fputc_unlocked_r, (ptr, ch, file),
-       struct _reent *ptr _AND
-       int ch _AND
+       struct _reent *ptr,
+       int ch,
        FILE * file)
 {
   CHECK_INIT(ptr, file);
@@ -41,7 +41,7 @@ _DEFUN(_fputc_unlocked_r, (ptr, ch, file),
 #ifndef _REENT_ONLY
 int
 _DEFUN(fputc_unlocked, (ch, file),
-       int ch _AND
+       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 c4588265b..7adb89a04 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -87,8 +87,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 int
 _DEFUN(_fputs_r, (ptr, s, fp),
-       struct _reent * ptr _AND
-       char _CONST *__restrict s _AND
+       struct _reent * ptr,
+       char _CONST *__restrict s,
        FILE *__restrict fp)
 {
 #ifdef _FVWRITE_IN_STREAMIO
@@ -136,7 +136,7 @@ error:
 #ifndef _REENT_ONLY
 int
 _DEFUN(fputs, (s, fp),
-       char _CONST *__restrict s _AND
+       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 5e2a9e322..4943cef99 100644
--- a/newlib/libc/stdio/fputwc.c
+++ b/newlib/libc/stdio/fputwc.c
@@ -129,8 +129,8 @@ PORTABILITY
 
 wint_t
 _DEFUN(__fputwc, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
  FILE *fp)
 {
   char buf[MB_LEN_MAX];
@@ -164,8 +164,8 @@ _DEFUN(__fputwc, (ptr, wc, fp),
 
 wint_t
 _DEFUN(_fputwc_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
  FILE *fp)
 {
   wint_t r;
@@ -179,7 +179,7 @@ _DEFUN(_fputwc_r, (ptr, wc, fp),
 
 wint_t
 _DEFUN(fputwc, (wc, fp),
- wchar_t wc _AND
+ 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 43be648f7..4d4f07a0a 100644
--- a/newlib/libc/stdio/fputwc_u.c
+++ b/newlib/libc/stdio/fputwc_u.c
@@ -31,8 +31,8 @@
 
 wint_t
 _DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
  FILE *fp)
 {
   ORIENT(fp, 1);
@@ -41,7 +41,7 @@ _DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
 
 wint_t
 _DEFUN(fputwc_unlocked, (wc, fp),
- wchar_t wc _AND
+ wchar_t wc,
  FILE *fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputws.c b/newlib/libc/stdio/fputws.c
index c68241c92..8a470fcfb 100644
--- a/newlib/libc/stdio/fputws.c
+++ b/newlib/libc/stdio/fputws.c
@@ -95,8 +95,8 @@ PORTABILITY
 
 int
 _DEFUN(_fputws_r, (ptr, ws, fp),
- struct _reent *ptr _AND
- const wchar_t *ws _AND
+ struct _reent *ptr,
+ const wchar_t *ws,
  FILE *fp)
 {
   size_t nbytes;
@@ -159,7 +159,7 @@ error:
 
 int
 _DEFUN(fputws, (ws, fp),
- const wchar_t *__restrict ws _AND
+ 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 c2e60bedc..cff60efe1 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -94,10 +94,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef __SCLE
 static size_t
 _DEFUN(crlf_r, (ptr, fp, buf, count, eof),
-       struct _reent * ptr _AND
-       FILE * fp _AND
-       char * buf _AND
-       size_t count _AND
+       struct _reent * ptr,
+       FILE * fp,
+       char * buf,
+       size_t count,
        int eof)
 {
   int r;
@@ -143,10 +143,10 @@ _DEFUN(crlf_r, (ptr, fp, buf, count, eof),
 
 size_t
 _DEFUN(_fread_r, (ptr, buf, size, count, fp),
-       struct _reent * ptr _AND
-       _PTR __restrict buf _AND
-       size_t size _AND
-       size_t count _AND
+       struct _reent * ptr,
+       _PTR __restrict buf,
+       size_t size,
+       size_t count,
        FILE * __restrict fp)
 {
   register size_t resid;
@@ -261,9 +261,9 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN(fread, (buf, size, count, fp),
-       _PTR __restrict  buf _AND
-       size_t size _AND
-       size_t count _AND
+       _PTR __restrict  buf,
+       size_t size,
+       size_t count,
        FILE *__restrict fp)
 {
    return _fread_r (_REENT, buf, size, count, fp);
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index e5bb73a26..b9fee0c7b 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -76,9 +76,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 FILE *
 _DEFUN(_freopen_r, (ptr, file, mode, fp),
-       struct _reent *ptr _AND
-       const char *__restrict file _AND
-       const char *__restrict mode _AND
+       struct _reent *ptr,
+       const char *__restrict file,
+       const char *__restrict mode,
        register FILE *__restrict fp)
 {
   register int f;
@@ -244,8 +244,8 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
 
 FILE *
 _DEFUN(freopen, (file, mode, fp),
-       _CONST char *__restrict file _AND
-       _CONST char *__restrict mode _AND
+       _CONST char *__restrict file,
+       _CONST char *__restrict mode,
        register FILE *__restrict fp)
 {
   return _freopen_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index b5bd979d3..4b8a1e099 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -82,9 +82,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(_fseek_r, (ptr, fp, offset, whence),
-       struct _reent *ptr _AND
-       register FILE *fp  _AND
-       long offset        _AND
+       struct _reent *ptr,
+       register FILE *fp,
+       long offset,
        int whence)
 {
   return _fseeko_r (ptr, fp, offset, whence);
@@ -94,8 +94,8 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
 
 int
 _DEFUN(fseek, (fp, offset, whence),
-       register FILE *fp _AND
-       long offset       _AND
+       register FILE *fp,
+       long offset,
        int whence)
 {
   return _fseek_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index 52f978929..58bb9511b 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -94,9 +94,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(_fseeko_r, (ptr, fp, offset, whence),
-       struct _reent *ptr _AND
-       register FILE *fp  _AND
-       _off_t offset      _AND
+       struct _reent *ptr,
+       register FILE *fp,
+       _off_t offset,
        int whence)
 {
   _fpos_t _EXFNPTR(seekfn, (struct _reent *, _PTR, _fpos_t, int));
@@ -360,8 +360,8 @@ dumb:
 
 int
 _DEFUN(fseeko, (fp, offset, whence),
-       register FILE *fp _AND
-       _off_t offset     _AND
+       register FILE *fp,
+       _off_t offset,
        int whence)
 {
   return _fseeko_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio/fsetlocking.c b/newlib/libc/stdio/fsetlocking.c
index d62aef334..e27aa42fc 100644
--- a/newlib/libc/stdio/fsetlocking.c
+++ b/newlib/libc/stdio/fsetlocking.c
@@ -66,7 +66,7 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN(__fsetlocking, (fp, type),
-       FILE * fp _AND
+       FILE * fp,
        int type)
 {
   int result;
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index a2a5d7b2e..ffc9d794c 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -60,8 +60,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(_fsetpos_r, (ptr, iop, pos),
-       struct _reent * ptr _AND
-       FILE * iop          _AND
+       struct _reent * ptr,
+       FILE * iop,
        _CONST _fpos_t * pos)
 {
   int x = _fseek_r (ptr, iop, *pos, SEEK_SET);
@@ -75,7 +75,7 @@ _DEFUN(_fsetpos_r, (ptr, iop, pos),
 
 int
 _DEFUN(fsetpos, (iop, pos),
-       FILE * iop _AND
+       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 70eed84c0..1260d5ef4 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -84,7 +84,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 long
 _DEFUN(_ftell_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE * fp)
 {
   _fpos_t pos;
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index c120c26a9..19299c3ad 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -84,7 +84,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 _off_t
 _DEFUN(_ftello_r, (ptr, fp),
-       struct _reent * ptr _AND
+       struct _reent * ptr,
        register FILE * fp)
 {
   _fpos_t pos;
diff --git a/newlib/libc/stdio/funopen.c b/newlib/libc/stdio/funopen.c
index 58b75648a..23bed7b8e 100644
--- a/newlib/libc/stdio/funopen.c
+++ b/newlib/libc/stdio/funopen.c
@@ -105,9 +105,9 @@ typedef struct funcookie {
 
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(funreader, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   int result;
@@ -120,9 +120,9 @@ _DEFUN(funreader, (ptr, cookie, buf, n),
 
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(funwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       const char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   int result;
@@ -135,9 +135,9 @@ _DEFUN(funwriter, (ptr, cookie, buf, n),
 
 static _fpos_t
 _DEFUN(funseeker, (ptr, cookie, off, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos_t off _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos_t off,
        int whence)
 {
   funcookie *c = (funcookie *) cookie;
@@ -163,9 +163,9 @@ _DEFUN(funseeker, (ptr, cookie, off, whence),
 #ifdef __LARGE64_FILES
 static _fpos64_t
 _DEFUN(funseeker64, (ptr, cookie, off, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos64_t off _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos64_t off,
        int whence)
 {
   _fpos64_t result;
@@ -179,7 +179,7 @@ _DEFUN(funseeker64, (ptr, cookie, off, whence),
 
 static int
 _DEFUN(funcloser, (ptr, cookie),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        void *cookie)
 {
   int result = 0;
@@ -196,11 +196,11 @@ _DEFUN(funcloser, (ptr, cookie),
 
 FILE *
 _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
-       struct _reent *ptr _AND
-       const void *cookie _AND
-       funread readfn _AND
-       funwrite writefn _AND
-       funseek seekfn _AND
+       struct _reent *ptr,
+       const void *cookie,
+       funread readfn,
+       funwrite writefn,
+       funseek seekfn,
        funclose closefn)
 {
   FILE *fp;
@@ -268,10 +268,10 @@ _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN(funopen, (cookie, readfn, writefn, seekfn, closefn),
-       const void *cookie _AND
-       funread readfn _AND
-       funwrite writefn _AND
-       funseek seekfn _AND
+       const void *cookie,
+       funread readfn,
+       funwrite writefn,
+       funseek seekfn,
        funclose closefn)
 {
   return _funopen_r (_REENT, cookie, readfn, writefn, seekfn, closefn);
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index 455666006..a0432a03d 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -46,8 +46,8 @@
 
 int
 _DEFUN(__sfvwrite_r, (ptr, fp, uio),
-       struct _reent *ptr _AND
-       register FILE *fp _AND
+       struct _reent *ptr,
+       register FILE *fp,
        register struct __suio *uio)
 {
   register size_t len;
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index cceaa96c2..8b7b5b0e3 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -29,7 +29,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_fwalk, (ptr, function),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register int (*function) (FILE *))
 {
   register FILE *fp;
@@ -56,7 +56,7 @@ _DEFUN(_fwalk, (ptr, function),
    I/O function (e.g. _fclose_r).  */
 int
 _DEFUN(_fwalk_reent, (ptr, reent_function),
-       struct _reent *ptr _AND
+       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 a57a77c95..719a58acd 100644
--- a/newlib/libc/stdio/fwide.c
+++ b/newlib/libc/stdio/fwide.c
@@ -49,8 +49,8 @@ C99, POSIX.1-2001.
 
 int
 _DEFUN(_fwide_r, (ptr, fp, mode),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
  int mode)
 {
   int ret;
@@ -71,7 +71,7 @@ _DEFUN(_fwide_r, (ptr, fp, mode),
 
 int
 _DEFUN(fwide, (fp, mode),
- FILE *fp _AND
+ 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 4b05824c4..00a8d41f9 100644
--- a/newlib/libc/stdio/fwprintf.c
+++ b/newlib/libc/stdio/fwprintf.c
@@ -24,8 +24,8 @@
 
 int
 _DEFUN(_fwprintf_r, (ptr, fp, fmt),
-       struct _reent *ptr _AND
-       FILE *fp _AND
+       struct _reent *ptr,
+       FILE *fp,
        const wchar_t *fmt _DOTS)
 {
   int ret;
@@ -41,7 +41,7 @@ _DEFUN(_fwprintf_r, (ptr, fp, fmt),
 
 int
 _DEFUN(fwprintf, (fp, fmt),
-       FILE *__restrict fp _AND
+       FILE *__restrict fp,
        const wchar_t *__restrict fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 2ba71f38a..a805eff7f 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -109,10 +109,10 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 size_t
 _DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
-       struct _reent * ptr _AND
-       _CONST _PTR __restrict buf _AND
-       size_t size     _AND
-       size_t count    _AND
+       struct _reent * ptr,
+       _CONST _PTR __restrict buf,
+       size_t size,
+       size_t count,
        FILE * __restrict fp)
 {
   size_t n;
@@ -171,9 +171,9 @@ ret:
 #ifndef _REENT_ONLY
 size_t
 _DEFUN(fwrite, (buf, size, count, fp),
-       _CONST _PTR __restrict buf _AND
-       size_t size     _AND
-       size_t count    _AND
+       _CONST _PTR __restrict buf,
+       size_t size,
+       size_t count,
        FILE * fp)
 {
   return _fwrite_r (_REENT, buf, size, count, fp);
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 37e345870..269bfb1d3 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -77,7 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_getc_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE *fp)
 {
   int result;
diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
index 6b71ce52d..2f9f0e818 100644
--- a/newlib/libc/stdio/getc_u.c
+++ b/newlib/libc/stdio/getc_u.c
@@ -70,7 +70,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_getc_unlocked_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE *fp)
 {
   /* CHECK_INIT is called (eventually) by __srefill_r.  */
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
index d806c02cf..4164be5c5 100644
--- a/newlib/libc/stdio/getdelim.c
+++ b/newlib/libc/stdio/getdelim.c
@@ -41,9 +41,9 @@ No supporting OS subroutines are directly required.
 
 ssize_t
 _DEFUN(__getdelim, (bufptr, n, delim, fp),
-       char **bufptr _AND
-       size_t *n     _AND
-       int delim     _AND
+       char **bufptr,
+       size_t *n,
+       int delim,
        FILE *fp)
 {
   char *buf;
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index 66ffd1990..b212a8c8f 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -38,8 +38,8 @@ extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
 
 ssize_t
 _DEFUN(__getline, (lptr, n, fp),
-       char **lptr _AND
-       size_t *n   _AND
+       char **lptr,
+       size_t *n,
        FILE *fp)
 {
   return __getdelim (lptr, n, '\n', fp);
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index a78d06b89..4e951efe3 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -64,7 +64,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 char *
 _DEFUN(_gets_r, (ptr, buf),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        char *buf)
 {
   register int c;
diff --git a/newlib/libc/stdio/getwc.c b/newlib/libc/stdio/getwc.c
index 6d88fa869..db9a43768 100644
--- a/newlib/libc/stdio/getwc.c
+++ b/newlib/libc/stdio/getwc.c
@@ -34,7 +34,7 @@
 
 wint_t
 _DEFUN(_getwc_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  FILE *fp)
 {
   return _fgetwc_r (ptr, fp);
diff --git a/newlib/libc/stdio/getwc_u.c b/newlib/libc/stdio/getwc_u.c
index 613b69eca..913c3e08b 100644
--- a/newlib/libc/stdio/getwc_u.c
+++ b/newlib/libc/stdio/getwc_u.c
@@ -35,7 +35,7 @@
 
 wint_t
 _DEFUN(_getwc_unlocked_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  FILE *fp)
 {
   return _fgetwc_unlocked_r (ptr, fp);
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index c55f7ce17..6c30c4257 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -43,7 +43,7 @@ _DEFUN(iprintf, (fmt),
 
 int
 _DEFUN(_iprintf_r, (ptr, fmt),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        const char *fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index ab20a0838..ac1276b48 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -36,7 +36,7 @@
 
 _VOID
 _DEFUN(__smakebuf_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE *fp)
 {
   register _PTR p;
@@ -77,9 +77,9 @@ _DEFUN(__smakebuf_r, (ptr, fp),
  */
 int
 _DEFUN(__swhatbuf_r, (ptr, fp, bufsize, couldbetty),
- struct _reent *ptr _AND
- FILE *fp _AND
- size_t *bufsize _AND
+ struct _reent *ptr,
+ FILE *fp,
+ size_t *bufsize,
  int *couldbetty)
 {
 #ifdef _FSEEK_OPTIMIZATION
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 3ece9ab2c..37092496b 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -140,11 +140,11 @@ Supporting OS subroutines required: <<getpid>>, <<mkdir>>, <<open>>, <<stat>>.
 
 static int
 _DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
-       struct _reent *ptr _AND
-       char *path         _AND
-       register int *doopen _AND
-       int domkdir        _AND
-       size_t suffixlen   _AND
+       struct _reent *ptr,
+       char *path,
+       register int *doopen,
+       int domkdir,
+       size_t suffixlen,
        int flags)
 {
   register char *start, *trv;
@@ -264,7 +264,7 @@ _DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
 
 int
 _DEFUN(_mkstemp_r, (ptr, path),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        char *path)
 {
   int fd;
@@ -275,7 +275,7 @@ _DEFUN(_mkstemp_r, (ptr, path),
 #if !defined _ELIX_LEVEL || _ELIX_LEVEL >= 4
 char *
 _DEFUN(_mkdtemp_r, (ptr, path),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        char *path)
 {
   return (_gettemp (ptr, path, (int *) NULL, 1, 0, 0) ? path : NULL);
@@ -283,8 +283,8 @@ _DEFUN(_mkdtemp_r, (ptr, path),
 
 int
 _DEFUN(_mkstemps_r, (ptr, path, len),
-       struct _reent *ptr _AND
-       char *path _AND
+       struct _reent *ptr,
+       char *path,
        int len)
 {
   int fd;
@@ -294,8 +294,8 @@ _DEFUN(_mkstemps_r, (ptr, path, len),
 
 int
 _DEFUN(_mkostemp_r, (ptr, path, flags),
-       struct _reent *ptr _AND
-       char *path _AND
+       struct _reent *ptr,
+       char *path,
        int flags)
 {
   int fd;
@@ -305,9 +305,9 @@ _DEFUN(_mkostemp_r, (ptr, path, flags),
 
 int
 _DEFUN(_mkostemps_r, (ptr, path, len, flags),
-       struct _reent *ptr _AND
-       char *path _AND
-       int len _AND
+       struct _reent *ptr,
+       char *path,
+       int len,
        int flags)
 {
   int fd;
@@ -318,7 +318,7 @@ _DEFUN(_mkostemps_r, (ptr, path, len, flags),
 
 char *
 _DEFUN(_mktemp_r, (ptr, path),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        char *path)
 {
   return (_gettemp (ptr, path, (int *) NULL, 0, 0, 0) ? path : (char *) NULL);
@@ -345,7 +345,7 @@ _DEFUN(mkdtemp, (path),
 
 int
 _DEFUN(mkstemps, (path, len),
-       char *path _AND
+       char *path,
        int len)
 {
   int fd;
@@ -355,7 +355,7 @@ _DEFUN(mkstemps, (path, len),
 
 int
 _DEFUN(mkostemp, (path, flags),
-       char *path _AND
+       char *path,
        int flags)
 {
   int fd;
@@ -365,8 +365,8 @@ _DEFUN(mkostemp, (path, flags),
 
 int
 _DEFUN(mkostemps, (path, len, flags),
-       char *path _AND
-       int len _AND
+       char *path,
+       int len,
        int flags)
 {
   int fd;
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index e6604e771..648bb33a7 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -173,9 +173,9 @@ static char *rcsid = "$Id$";
 #ifdef STRING_ONLY
 int
 _DEFUN(__ssputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr _AND
-       FILE *fp _AND
-       _CONST char *buf _AND
+       struct _reent *ptr,
+       FILE *fp,
+       _CONST char *buf,
        size_t len)
 {
   register int w;
@@ -244,8 +244,8 @@ err:
    by a serial of functions like svfwprintf for wide char output.  */
 int
 _DEFUN(__ssprint_r, (ptr, fp, uio),
-       struct _reent *ptr _AND
-       FILE *fp _AND
+       struct _reent *ptr,
+       FILE *fp,
        register struct __suio *uio)
 {
   register size_t len;
@@ -348,8 +348,8 @@ err:
    then reset it so that it can be reused.  */
 int
 _DEFUN(__sprint_r, (ptr, fp, uio),
-       struct _reent *ptr _AND
-       FILE *fp _AND
+       struct _reent *ptr,
+       FILE *fp,
        register struct __suio *uio)
 {
   register int err = 0;
@@ -393,8 +393,8 @@ out:
 
 _NOINLINE_STATIC int
 _DEFUN(__sfputc_r, (ptr, c, fp),
-       struct _reent *ptr _AND
-       int c _AND
+       struct _reent *ptr,
+       int c,
        FILE *fp)
 {
   if (--fp->_w >= 0 || (fp->_w >= fp->_lbfsize && (char)c != '\n'))
@@ -405,9 +405,9 @@ _DEFUN(__sfputc_r, (ptr, c, fp),
 
 int
 _DEFUN(__sfputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr _AND
-       FILE *fp _AND
-       _CONST char *buf _AND
+       struct _reent *ptr,
+       FILE *fp,
+       _CONST char *buf,
        size_t len)
 {
   register int i;
@@ -443,8 +443,8 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
 #ifndef STRING_ONLY
 int
 _DEFUN(VFPRINTF, (fp, fmt0, ap),
-       FILE * fp         _AND
-       _CONST char *fmt0 _AND
+       FILE * fp,
+       _CONST char *fmt0,
        va_list ap)
 {
   int result;
@@ -472,9 +472,9 @@ _EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
 
 int
 _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data _AND
-       FILE * fp           _AND
-       _CONST char *fmt0   _AND
+       struct _reent *data,
+       FILE * fp,
+       _CONST char *fmt0,
        va_list ap)
 {
   register char *fmt; /* Format string.  */
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 564f2916d..479f9776f 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -136,8 +136,8 @@ Supporting OS subroutines required:
 
 int
 _DEFUN(VFSCANF, (fp, fmt, ap),
-       register FILE *fp _AND
-       _CONST char *fmt _AND
+       register FILE *fp,
+       _CONST char *fmt,
        va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -150,8 +150,8 @@ _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
 
 int
 _DEFUN(__SVFSCANF, (fp, fmt0, ap),
-       register FILE *fp _AND
-       char _CONST *fmt0 _AND
+       register FILE *fp,
+       char _CONST *fmt0,
        va_list ap)
 {
   return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -161,9 +161,9 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
 
 int
 _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data _AND
-       register FILE *fp   _AND
-       _CONST char *fmt    _AND
+       struct _reent *data,
+       register FILE *fp,
+       _CONST char *fmt,
        va_list ap)
 {
   CHECK_INIT(data, fp);
@@ -181,8 +181,8 @@ _EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
    So, we create our own trimmed-down version.  */
 int
 _DEFUN(_sungetc_r, (data, fp, ch),
- struct _reent *data _AND
- int c               _AND
+ struct _reent *data,
+ int c,
  register FILE *fp)
 {
   if (c == EOF)
@@ -230,7 +230,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 _AND
+       struct _reent * ptr,
        register FILE * fp)
 {
   /* Our only hope of further input is the ungetc buffer.
@@ -260,9 +260,9 @@ size_t _EXFUN (_sfread_r, (struct _reent *, _PTR buf, size_t, size_t, FILE *));
 
 int
 _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       char _CONST *fmt0   _AND
+       struct _reent *rptr,
+       register FILE *fp,
+       char _CONST *fmt0,
        va_list ap)
 {
   register u_char *fmt = (u_char *) fmt0;
diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c
index 9e6736f77..5dd64115b 100644
--- a/newlib/libc/stdio/open_memstream.c
+++ b/newlib/libc/stdio/open_memstream.c
@@ -94,9 +94,9 @@ typedef struct memstream {
    returning the number of bytes written or EOF on failure.  */
 static _READ_WRITE_RETURN_TYPE
 _DEFUN(memwriter, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       const char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       const char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   memstream *c = (memstream *) cookie;
@@ -148,9 +148,9 @@ _DEFUN(memwriter, (ptr, cookie, buf, n),
    COOKIE; return resulting position or fail with EOF.  */
 static _fpos_t
 _DEFUN(memseeker, (ptr, cookie, pos, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos_t pos _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos_t pos,
        int whence)
 {
   memstream *c = (memstream *) cookie;
@@ -216,9 +216,9 @@ _DEFUN(memseeker, (ptr, cookie, pos, whence),
 #ifdef __LARGE64_FILES
 static _fpos64_t
 _DEFUN(memseeker64, (ptr, cookie, pos, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos64_t pos _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos64_t pos,
        int whence)
 {
   _off64_t offset = (_off64_t) pos;
@@ -276,7 +276,7 @@ _DEFUN(memseeker64, (ptr, cookie, pos, whence),
 /* Reclaim resources used by stream described by COOKIE.  */
 static int
 _DEFUN(memcloser, (ptr, cookie),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        void *cookie)
 {
   memstream *c = (memstream *) cookie;
@@ -296,9 +296,9 @@ _DEFUN(memcloser, (ptr, cookie),
    Return the new stream, or fail with NULL.  */
 static FILE *
 _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
-       struct _reent *ptr _AND
-       char **buf _AND
-       size_t *size _AND
+       struct _reent *ptr,
+       char **buf,
+       size_t *size,
        int wide)
 {
   FILE *fp;
@@ -379,8 +379,8 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
 
 FILE *
 _DEFUN(_open_memstream_r, (ptr, buf, size),
-       struct _reent *ptr _AND
-       char **buf _AND
+       struct _reent *ptr,
+       char **buf,
        size_t *size)
 {
   return internal_open_memstream_r (ptr, buf, size, -1);
@@ -388,8 +388,8 @@ _DEFUN(_open_memstream_r, (ptr, buf, size),
 
 FILE *
 _DEFUN(_open_wmemstream_r, (ptr, buf, size),
-       struct _reent *ptr _AND
-       wchar_t **buf _AND
+       struct _reent *ptr,
+       wchar_t **buf,
        size_t *size)
 {
   return internal_open_memstream_r (ptr, (char **)buf, size, 1);
@@ -398,7 +398,7 @@ _DEFUN(_open_wmemstream_r, (ptr, buf, size),
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN(open_memstream, (buf, size),
-       char **buf _AND
+       char **buf,
        size_t *size)
 {
   return _open_memstream_r (_REENT, buf, size);
@@ -406,7 +406,7 @@ _DEFUN(open_memstream, (buf, size),
 
 FILE *
 _DEFUN(open_wmemstream, (buf, size),
-       wchar_t **buf _AND
+       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 0f0259632..cd1829180 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -60,7 +60,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _VOID
 _DEFUN(_perror_r, (ptr, s),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        _CONST char *s)
 {
   char *error;
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index d5dedf906..ba5b76850 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -24,7 +24,7 @@
 
 int
 _DEFUN(_printf_r, (ptr, fmt),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        const char *__restrict fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index a00aaad08..e69841d17 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -79,8 +79,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_putc_r, (ptr, c, fp),
-       struct _reent *ptr _AND
-       int c _AND
+       struct _reent *ptr,
+       int c,
        register FILE *fp)
 {
   int result;
@@ -94,7 +94,7 @@ _DEFUN(_putc_r, (ptr, c, fp),
 #ifndef _REENT_ONLY
 int
 _DEFUN(putc, (c, fp),
-       int c _AND
+       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 f710aaf57..b53060bed 100644
--- a/newlib/libc/stdio/putc_u.c
+++ b/newlib/libc/stdio/putc_u.c
@@ -71,8 +71,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_putc_unlocked_r, (ptr, c, fp),
-       struct _reent *ptr _AND
-       int c _AND
+       struct _reent *ptr,
+       int c,
        register FILE *fp)
 {
   /* CHECK_INIT is (eventually) called by __swbuf.  */
@@ -83,7 +83,7 @@ _DEFUN(_putc_unlocked_r, (ptr, c, fp),
 #ifndef _REENT_ONLY
 int
 _DEFUN(putc_unlocked, (c, fp),
-       int c _AND
+       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 a4b669832..813144a2b 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -68,7 +68,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_putchar_r, (ptr, c),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        int c)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c
index a866c7799..e0ed8f7d7 100644
--- a/newlib/libc/stdio/putchar_u.c
+++ b/newlib/libc/stdio/putchar_u.c
@@ -62,7 +62,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_putchar_unlocked_r, (ptr, c),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        int c)
 {
   return putc_unlocked (c, _stdout_r (ptr));
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 72f929eea..36cc83203 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -66,7 +66,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_puts_r, (ptr, s),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        _CONST char * s)
 {
 #ifdef _FVWRITE_IN_STREAMIO
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index d4f785814..1e3c78c3e 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -50,7 +50,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(putw, (w, fp),
-       int w _AND
+       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 9a84f35fb..7c31d23d8 100644
--- a/newlib/libc/stdio/putwc.c
+++ b/newlib/libc/stdio/putwc.c
@@ -34,8 +34,8 @@
 
 wint_t
 _DEFUN(_putwc_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
  FILE *fp)
 {
   return _fputwc_r (ptr, wc, fp);
@@ -46,7 +46,7 @@ _DEFUN(_putwc_r, (ptr, wc, fp),
  */
 wint_t
 _DEFUN(putwc, (wc, fp),
- wchar_t wc _AND
+ 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 bb71acc2a..cb09fd2db 100644
--- a/newlib/libc/stdio/putwc_u.c
+++ b/newlib/libc/stdio/putwc_u.c
@@ -35,8 +35,8 @@
 
 wint_t
 _DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
  FILE *fp)
 {
   return _fputwc_unlocked_r (ptr, wc, fp);
@@ -47,7 +47,7 @@ _DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
  */
 wint_t
 _DEFUN(putwc_unlocked, (wc, fp),
- wchar_t wc _AND
+ 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 248d5922d..66ed30ac0 100644
--- a/newlib/libc/stdio/putwchar.c
+++ b/newlib/libc/stdio/putwchar.c
@@ -88,7 +88,7 @@ PORTABILITY
 
 wint_t
 _DEFUN(_putwchar_r, (ptr, wc),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  wchar_t wc)
 {
   return _fputwc_r (ptr, wc, stdout);
diff --git a/newlib/libc/stdio/putwchar_u.c b/newlib/libc/stdio/putwchar_u.c
index 3235472a2..68c5abe26 100644
--- a/newlib/libc/stdio/putwchar_u.c
+++ b/newlib/libc/stdio/putwchar_u.c
@@ -35,7 +35,7 @@
 
 wint_t
 _DEFUN(_putwchar_unlocked_r, (ptr, wc),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  wchar_t wc)
 {
   return _fputwc_unlocked_r (ptr, wc, stdout);
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index 9d853f94d..fc738d455 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -38,7 +38,7 @@ _DEFUN(lflush, (fp),
 
 int
 _DEFUN(__srefill_r, (ptr, fp),
-       struct _reent * ptr _AND
+       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 7b8d3060f..18c468d61 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -60,7 +60,7 @@ Supporting OS subroutine required: <<unlink>>.
 
 int
 _DEFUN(_remove_r, (ptr, filename),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        _CONST char *filename)
 {
   if (_unlink_r (ptr, filename) == -1)
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index 1b807f8b2..a2b0d4188 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -55,7 +55,7 @@ Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
 
 int
 _DEFUN(rename, (old, new),
-       _CONST char *old _AND
+       _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 417a5963d..873083b85 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -53,7 +53,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 _VOID
 _DEFUN(_rewind_r, (ptr, fp),
-       struct _reent * ptr _AND
+       struct _reent * ptr,
        register FILE * fp)
 {
   _CAST_VOID _fseek_r (ptr, fp, 0L, SEEK_SET);
diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c
index 9474bd9f6..d76f307d7 100644
--- a/newlib/libc/stdio/rget.c
+++ b/newlib/libc/stdio/rget.c
@@ -33,7 +33,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(__srget_r, (ptr, fp),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        register FILE *fp)
 {
   /* Ensure that any fake std stream is resolved before
diff --git a/newlib/libc/stdio/sccl.c b/newlib/libc/stdio/sccl.c
index b01801145..d0bdfd936 100644
--- a/newlib/libc/stdio/sccl.c
+++ b/newlib/libc/stdio/sccl.c
@@ -32,7 +32,7 @@
 
 u_char *
 _DEFUN(__sccl, (tab, fmt),
-       register char *tab _AND
+       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 29f5377a7..a7df3a1f4 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -66,7 +66,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _VOID
 _DEFUN(setbuf, (fp, buf),
-       FILE *__restrict fp _AND
+       FILE *__restrict fp,
        char *__restrict buf)
 {
   _CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index 880779d13..cbcbde3db 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -66,8 +66,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _VOID
 _DEFUN(setbuffer, (fp, buf, size),
-       FILE * fp _AND
-       char *buf _AND
+       FILE * fp,
+       char *buf,
        int size)
 {
   _CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, (size_t) size);
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index 6fa0252b0..684a8b582 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -89,9 +89,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(setvbuf, (fp, buf, mode, size),
-       register FILE * fp _AND
-       char *buf          _AND
-       register int mode  _AND
+       register FILE * fp,
+       char *buf,
+       register int mode,
        register size_t size)
 {
   int ret = 0;
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index d9559c359..861fc8d67 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -105,8 +105,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 int
 #ifdef _HAVE_STDC
 _DEFUN(_siprintf_r, (ptr, str, fmt),
-       struct _reent *ptr _AND
-       char *str          _AND
+       struct _reent *ptr,
+       char *str,
        _CONST char *fmt _DOTS)
 #else
 _siprintf_r(ptr, str, fmt, va_alist)
@@ -140,7 +140,7 @@ _siprintf_r(ptr, str, fmt, va_alist)
 int
 #ifdef _HAVE_STDC
 _DEFUN(siprintf, (str, fmt),
-       char *str _AND
+       char *str,
        _CONST char *fmt _DOTS)
 #else
 siprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index c89eb7c8d..81d60d0ba 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -88,7 +88,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef _HAVE_STDC
 int
 _DEFUN(siscanf, (str, fmt),
-       _CONST char *str _AND
+       _CONST char *str,
        _CONST char *fmt _DOTS)
 #else
 int
@@ -124,8 +124,8 @@ siscanf(str, fmt, va_alist)
 #ifdef _HAVE_STDC
 int
 _DEFUN(_siscanf_r, (ptr, str, fmt),
-       struct _reent *ptr _AND
-       _CONST char *str   _AND
+       struct _reent *ptr,
+       _CONST char *str,
        _CONST char *fmt _DOTS)
 #else
 int
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index 98a2c2509..65e5b067f 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -33,9 +33,9 @@
 int
 #ifdef _HAVE_STDC
 _DEFUN (_sniprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr _AND
- char *str _AND
- size_t size _AND
+ struct _reent *ptr,
+ char *str,
+ size_t size,
  _CONST char *fmt _DOTS)
 #else
 _sniprintf_r (ptr, str, size, fmt, va_alist)
@@ -78,8 +78,8 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
 int
 #ifdef _HAVE_STDC
 _DEFUN (sniprintf, (str, size, fmt),
- char *str _AND
- size_t size _AND
+ char *str,
+ size_t size,
  _CONST char *fmt _DOTS)
 #else
 sniprintf (str, size, fmt, va_alist)
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d2408b2f0..2066a56ba 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -32,9 +32,9 @@
 int
 #ifdef _HAVE_STDC
 _DEFUN(_snprintf_r, (ptr, str, size, fmt),
-       struct _reent *ptr _AND
-       char *__restrict str          _AND
-       size_t size        _AND
+       struct _reent *ptr,
+       char *__restrict str,
+       size_t size,
        _CONST char *__restrict fmt _DOTS)
 #else
 _snprintf_r(ptr, str, size, fmt, va_alist)
@@ -83,8 +83,8 @@ _EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
 int
 #ifdef _HAVE_STDC
 _DEFUN(snprintf, (str, size, fmt),
-       char *__restrict str _AND
-       size_t size _AND
+       char *__restrict str,
+       size_t size,
        _CONST char *__restrict fmt _DOTS)
 #else
 snprintf(str, size, fmt, va_alist)
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 7fc9e6821..7ed0a0fd4 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -581,8 +581,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 int
 #ifdef _HAVE_STDC
 _DEFUN(_sprintf_r, (ptr, str, fmt),
-       struct _reent *ptr _AND
-       char *__restrict str          _AND
+       struct _reent *ptr,
+       char *__restrict str,
        _CONST char *__restrict fmt _DOTS)
 #else
 _sprintf_r(ptr, str, fmt, va_alist)
@@ -622,7 +622,7 @@ _EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
 int
 #ifdef _HAVE_STDC
 _DEFUN(sprintf, (str, fmt),
-       char *__restrict str _AND
+       char *__restrict str,
        _CONST char *__restrict fmt _DOTS)
 #else
 sprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index d2d9dfe8b..bfec067e9 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -427,7 +427,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef _HAVE_STDC
 int
 _DEFUN(sscanf, (str, fmt),
-       _CONST char *__restrict str _AND
+       _CONST char *__restrict str,
        _CONST char * fmt _DOTS)
 #else
 int
@@ -469,8 +469,8 @@ _EXFUN(siscanf, (const char *, const char *, ...)
 #ifdef _HAVE_STDC
 int
 _DEFUN(_sscanf_r, (ptr, str, fmt),
-       struct _reent *ptr _AND
-       _CONST char *__restrict str   _AND
+       struct _reent *ptr,
+       _CONST char *__restrict str,
        _CONST char *__restrict fmt _DOTS)
 #else
 int
diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index a6e28f5a9..e64c061dd 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -31,9 +31,9 @@
 
 _READ_WRITE_RETURN_TYPE
 _DEFUN(__sread, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   register FILE *fp = (FILE *) cookie;
@@ -64,9 +64,9 @@ _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 _AND
-       _PTR cookie _AND
-       char *buf   _AND
+       struct _reent *_ptr,
+       _PTR cookie,
+       char *buf,
        _READ_WRITE_BUFSIZE_TYPE len)
 {
   return 0;
@@ -74,9 +74,9 @@ _DEFUN(__seofread, (ptr, cookie, buf, len),
 
 _READ_WRITE_RETURN_TYPE
 _DEFUN(__swrite, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char const *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char const *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   register FILE *fp = (FILE *) cookie;
@@ -106,9 +106,9 @@ _DEFUN(__swrite, (ptr, cookie, buf, n),
 
 _fpos_t
 _DEFUN(__sseek, (ptr, cookie, offset, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos_t offset _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos_t offset,
        int whence)
 {
   register FILE *fp = (FILE *) cookie;
@@ -127,7 +127,7 @@ _DEFUN(__sseek, (ptr, cookie, offset, whence),
 
 int
 _DEFUN(__sclose, (ptr, cookie),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        void *cookie)
 {
   FILE *fp = (FILE *) cookie;
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index fe106f036..0ddc492ee 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -554,9 +554,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(_swprintf_r, (ptr, str, size, fmt),
-       struct _reent *ptr _AND
-       wchar_t *str          _AND
-       size_t size        _AND
+       struct _reent *ptr,
+       wchar_t *str,
+       size_t size,
        _CONST wchar_t *fmt _DOTS)
 {
   int ret;
@@ -595,8 +595,8 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
 
 int
 _DEFUN(swprintf, (str, size, fmt),
-       wchar_t *__restrict str   _AND
-       size_t size _AND
+       wchar_t *__restrict str,
+       size_t size,
        _CONST wchar_t *__restrict fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index 765d27afd..fbd60fc7c 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -87,11 +87,11 @@ The global pointer <<environ>> is also required.
 
 static int
 _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
-       struct _reent *ptr _AND
-       char *result       _AND
-       _CONST char *part1 _AND
-       _CONST char *part2 _AND
-       int part3          _AND
+       struct _reent *ptr,
+       char *result,
+       _CONST char *part1,
+       _CONST char *part2,
+       int part3,
        int *part4)
 {
   /*  Generate the filename and make sure that there isn't one called
@@ -119,7 +119,7 @@ _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
 
 char *
 _DEFUN(_tmpnam_r, (p, s),
-       struct _reent *p _AND
+       struct _reent *p,
        char *s)
 {
   char *result;
@@ -148,8 +148,8 @@ _DEFUN(_tmpnam_r, (p, s),
 
 char *
 _DEFUN(_tempnam_r, (p, dir, pfx),
-       struct _reent *p _AND
-       _CONST char *dir _AND
+       struct _reent *p,
+       _CONST char *dir,
        _CONST char *pfx)
 {
   char *filename;
@@ -175,7 +175,7 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
 
 char *
 _DEFUN(tempnam, (dir, pfx),
-       _CONST char *dir _AND
+       _CONST char *dir,
        _CONST char *pfx)
 {
   return _tempnam_r (_REENT, dir, pfx);
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index da4b19d3c..98590478b 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -78,7 +78,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 /*static*/
 int
 _DEFUN(__submore, (rptr, fp),
-       struct _reent *rptr _AND
+       struct _reent *rptr,
        register FILE *fp)
 {
   register int i;
@@ -112,8 +112,8 @@ _DEFUN(__submore, (rptr, fp),
 
 int
 _DEFUN(_ungetc_r, (rptr, c, fp),
-       struct _reent *rptr _AND
-       int c               _AND
+       struct _reent *rptr,
+       int c,
        register FILE *fp)
 {
   if (c == EOF)
@@ -209,7 +209,7 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
 #ifndef _REENT_ONLY
 int
 _DEFUN(ungetc, (c, fp),
-       int c               _AND
+       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 000d4bdbb..60f3e5b49 100644
--- a/newlib/libc/stdio/ungetwc.c
+++ b/newlib/libc/stdio/ungetwc.c
@@ -75,8 +75,8 @@ C99
 
 wint_t
 _DEFUN(_ungetwc_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wint_t wc _AND
+ struct _reent *ptr,
+ wint_t wc,
  register FILE *fp)
 {
   char buf[MB_LEN_MAX];
@@ -107,7 +107,7 @@ _DEFUN(_ungetwc_r, (ptr, wc, fp),
  */
 wint_t
 _DEFUN(ungetwc, (wint_t wc, FILE *fp),
- wint_t wc _AND
+ wint_t wc,
  FILE *fp)
 {
   struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/vasiprintf.c b/newlib/libc/stdio/vasiprintf.c
index f96de0d79..259d44b0e 100644
--- a/newlib/libc/stdio/vasiprintf.c
+++ b/newlib/libc/stdio/vasiprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(vasiprintf, (strp, fmt, ap),
-       char **strp      _AND
-       const char *fmt _AND
+       char **strp,
+       const char *fmt,
        va_list ap)
 {
   return _vasiprintf_r (_REENT, strp, fmt, ap);
@@ -43,9 +43,9 @@ _DEFUN(vasiprintf, (strp, fmt, ap),
 
 int
 _DEFUN(_vasiprintf_r, (ptr, strp, fmt, ap),
-       struct _reent *ptr _AND
-       char **strp        _AND
-       const char *fmt   _AND
+       struct _reent *ptr,
+       char **strp,
+       const char *fmt,
        va_list ap)
 {
   int ret;
diff --git a/newlib/libc/stdio/vasniprintf.c b/newlib/libc/stdio/vasniprintf.c
index 56db45ec0..9bbe30c59 100644
--- a/newlib/libc/stdio/vasniprintf.c
+++ b/newlib/libc/stdio/vasniprintf.c
@@ -15,10 +15,10 @@
 
 char *
 _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
-       struct _reent *ptr _AND
-       char *buf _AND
-       size_t *lenp _AND
-       const char *fmt _AND
+       struct _reent *ptr,
+       char *buf,
+       size_t *lenp,
+       const char *fmt,
        va_list ap)
 {
   int ret;
@@ -60,9 +60,9 @@ _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
 
 char *
 _DEFUN(vasniprintf, (buf, lenp, fmt, ap),
-       char *buf _AND
-       size_t *lenp _AND
-       const char *fmt _AND
+       char *buf,
+       size_t *lenp,
+       const char *fmt,
        va_list ap)
 {
   return _vasniprintf_r (_REENT, buf, lenp, fmt, ap);
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 4cb43ce7a..6edb47398 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -15,10 +15,10 @@
 
 char *
 _DEFUN(_vasnprintf_r, (ptr, buf, lenp, fmt, ap),
-       struct _reent *ptr _AND
-       char *buf _AND
-       size_t *lenp _AND
-       const char *fmt _AND
+       struct _reent *ptr,
+       char *buf,
+       size_t *lenp,
+       const char *fmt,
        va_list ap)
 {
   int ret;
@@ -67,9 +67,9 @@ _EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
 
 char *
 _DEFUN(vasnprintf, (buf, lenp, fmt, ap),
-       char *buf _AND
-       size_t *lenp _AND
-       const char *fmt _AND
+       char *buf,
+       size_t *lenp,
+       const char *fmt,
        va_list ap)
 {
   return _vasnprintf_r (_REENT, buf, lenp, fmt, ap);
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index 5ba817d7b..c0961de01 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(vasprintf, (strp, fmt, ap),
-       char **strp      _AND
-       const char *fmt _AND
+       char **strp,
+       const char *fmt,
        va_list ap)
 {
   return _vasprintf_r (_REENT, strp, fmt, ap);
@@ -49,9 +49,9 @@ _EXFUN(vasiprintf, (char **, const char *, __VALIST)
 
 int
 _DEFUN(_vasprintf_r, (ptr, strp, fmt, ap),
-       struct _reent *ptr _AND
-       char **strp        _AND
-       const char *fmt   _AND
+       struct _reent *ptr,
+       char **strp,
+       const char *fmt,
        va_list ap)
 {
   int ret;
diff --git a/newlib/libc/stdio/vdiprintf.c b/newlib/libc/stdio/vdiprintf.c
index 51bdb000e..73a3b19d1 100644
--- a/newlib/libc/stdio/vdiprintf.c
+++ b/newlib/libc/stdio/vdiprintf.c
@@ -14,9 +14,9 @@
 
 int
 _DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
-       struct _reent *ptr _AND
-       int fd _AND
-       const char *format _AND
+       struct _reent *ptr,
+       int fd,
+       const char *format,
        va_list ap)
 {
   char *p;
@@ -37,8 +37,8 @@ _DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
 
 int
 _DEFUN(vdiprintf, (fd, format, ap),
-       int fd _AND
-       const char *format _AND
+       int fd,
+       const char *format,
        va_list ap)
 {
   return _vdiprintf_r (_REENT, fd, format, ap);
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index c295a3959..1b50e8833 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -14,9 +14,9 @@
 
 int
 _DEFUN(_vdprintf_r, (ptr, fd, format, ap),
-       struct _reent *ptr _AND
-       int fd _AND
-       const char *__restrict format _AND
+       struct _reent *ptr,
+       int fd,
+       const char *__restrict format,
        va_list ap)
 {
   char *p;
@@ -43,8 +43,8 @@ _EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
 
 int
 _DEFUN(vdprintf, (fd, format, ap),
-       int fd _AND
-       const char *__restrict format _AND
+       int fd,
+       const char *__restrict format,
        va_list ap)
 {
   return _vdprintf_r (_REENT, fd, format, ap);
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 50a3478a4..29dcb1633 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -199,9 +199,9 @@ static char *rcsid = "$Id$";
 #ifndef _FVWRITE_IN_STREAMIO
 int
 _DEFUN(__ssputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr _AND
-       FILE *fp _AND
-       _CONST char *buf _AND
+       struct _reent *ptr,
+       FILE *fp,
+       _CONST char *buf,
        size_t len)
 {
  register int w;
@@ -268,8 +268,8 @@ err:
 
 int
 _DEFUN(__ssprint_r, (ptr, fp, uio),
-       struct _reent *ptr _AND
-       FILE *fp _AND
+       struct _reent *ptr,
+       FILE *fp,
        register struct __suio *uio)
 {
  register size_t len;
@@ -370,9 +370,9 @@ int __ssprint_r (struct _reent *, FILE *, register struct __suio *);
 #ifndef _FVWRITE_IN_STREAMIO
 int
 _DEFUN(__sfputs_r, (ptr, fp, buf, len),
-       struct _reent *ptr _AND
-       FILE *fp _AND
-       _CONST char *buf _AND
+       struct _reent *ptr,
+       FILE *fp,
+       _CONST char *buf,
        size_t len)
 {
  register int i;
@@ -404,8 +404,8 @@ _DEFUN(__sfputs_r, (ptr, fp, buf, len),
  */
 int
 _DEFUN(__sprint_r, (ptr, fp, uio),
-       struct _reent *ptr _AND
-       FILE *fp _AND
+       struct _reent *ptr,
+       FILE *fp,
        register struct __suio *uio)
 {
  register int err = 0;
@@ -457,9 +457,9 @@ int __sprint_r (struct _reent *, FILE *, register struct __suio *);
  */
 _NOINLINE_STATIC int
 _DEFUN(__sbprintf, (rptr, fp, fmt, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       _CONST char *fmt  _AND
+       struct _reent *rptr,
+       register FILE *fp,
+       _CONST char *fmt,
        va_list ap)
 {
  int ret;
@@ -649,8 +649,8 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
 #ifndef STRING_ONLY
 int
 _DEFUN(VFPRINTF, (fp, fmt0, ap),
-       FILE * fp         _AND
-       _CONST char *fmt0 _AND
+       FILE * fp,
+       _CONST char *fmt0,
        va_list ap)
 {
   int result;
@@ -661,9 +661,9 @@ _DEFUN(VFPRINTF, (fp, fmt0, ap),
 
 int
 _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data _AND
-       FILE * fp           _AND
-       _CONST char *fmt0   _AND
+       struct _reent *data,
+       FILE * fp,
+       _CONST char *fmt0,
        va_list ap)
 {
  register char *fmt; /* format string */
@@ -2044,13 +2044,13 @@ _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 _AND
-       int n               _AND
-       char *fmt           _AND
-       va_list *ap         _AND
-       int *numargs_p      _AND
-       union arg_val *args _AND
-       int *arg_type       _AND
+       struct _reent *data,
+       int n,
+       char *fmt,
+       va_list *ap,
+       int *numargs_p,
+       union arg_val *args,
+       int *arg_type,
        char **last_fmt)
 {
   int ch;
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index b1453452c..3f67b2304 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -225,8 +225,8 @@ typedef unsigned long long u_long_long;
 
 int
 _DEFUN(VFSCANF, (fp, fmt, ap),
-       register FILE *fp _AND
-       _CONST char *fmt _AND
+       register FILE *fp,
+       _CONST char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -237,8 +237,8 @@ _DEFUN(VFSCANF, (fp, fmt, ap),
 
 int
 _DEFUN(__SVFSCANF, (fp, fmt0, ap),
-       register FILE *fp _AND
-       char _CONST *fmt0 _AND
+       register FILE *fp,
+       char _CONST *fmt0,
        va_list ap)
 {
   return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -248,9 +248,9 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
 
 int
 _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data _AND
-       register FILE *fp   _AND
-       _CONST char *fmt    _AND
+       struct _reent *data,
+       register FILE *fp,
+       _CONST char *fmt,
        va_list ap)
 {
   CHECK_INIT(data, fp);
@@ -264,8 +264,8 @@ _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
  * So, we create our own trimmed-down version.  */
 int
 _DEFUN(_sungetc_r, (data, fp, ch),
- struct _reent *data _AND
- int c               _AND
+ struct _reent *data,
+ int c,
  register FILE *fp)
 {
   if (c == EOF)
@@ -322,7 +322,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 _AND
+       struct _reent * ptr,
        register FILE * fp)
 {
   /*
@@ -348,10 +348,10 @@ _DEFUN(__ssrefill_r, (ptr, fp),
 
 size_t
 _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
-       struct _reent * ptr _AND
-       _PTR buf _AND
-       size_t size _AND
-       size_t count _AND
+       struct _reent * ptr,
+       _PTR buf,
+       size_t size,
+       size_t count,
        FILE * fp)
 {
   register size_t resid;
@@ -403,9 +403,9 @@ __wctob (struct _reent *rptr, wint_t wc)
 
 int
 _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       char _CONST *fmt0   _AND
+       struct _reent *rptr,
+       register FILE *fp,
+       char _CONST *fmt0,
        va_list ap)
 {
   register u_char *fmt = (u_char *) fmt0;
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 9c421d267..7339ffe53 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -175,9 +175,9 @@ int _EXFUN(__SPRINT, (struct _reent *, FILE *, _CONST char *, size_t));
  */
 static int
 _DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       _CONST wchar_t *fmt  _AND
+       struct _reent *rptr,
+       register FILE *fp,
+       _CONST wchar_t *fmt,
        va_list ap)
 {
  int ret;
@@ -367,8 +367,8 @@ _EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
 #ifndef STRING_ONLY
 int
 _DEFUN(VFWPRINTF, (fp, fmt0, ap),
-       FILE *__restrict fp         _AND
-       _CONST wchar_t *__restrict fmt0 _AND
+       FILE *__restrict fp,
+       _CONST wchar_t *__restrict fmt0,
        va_list ap)
 {
   int result;
@@ -379,9 +379,9 @@ _DEFUN(VFWPRINTF, (fp, fmt0, ap),
 
 int
 _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data _AND
-       FILE * fp           _AND
-       _CONST wchar_t *fmt0   _AND
+       struct _reent *data,
+       FILE * fp,
+       _CONST wchar_t *fmt0,
        va_list ap)
 {
  register wchar_t *fmt; /* format string */
@@ -1735,13 +1735,13 @@ 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 _AND
-       int n               _AND
-       wchar_t *fmt        _AND
-       va_list *ap         _AND
-       int *numargs_p      _AND
-       union arg_val *args _AND
-       int *arg_type       _AND
+       struct _reent *data,
+       int n,
+       wchar_t *fmt,
+       va_list *ap,
+       int *numargs_p,
+       union arg_val *args,
+       int *arg_type,
        wchar_t **last_fmt)
 {
   wchar_t ch;
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index a286464e6..715f231e3 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -227,8 +227,8 @@ static void * get_arg (int, va_list *, int *, void **);
 
 int
 _DEFUN(VFWSCANF, (fp, fmt, ap),
-       register FILE *__restrict fp _AND
-       _CONST wchar_t *__restrict fmt _AND
+       register FILE *__restrict fp,
+       _CONST wchar_t *__restrict fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -239,8 +239,8 @@ _DEFUN(VFWSCANF, (fp, fmt, ap),
 
 int
 _DEFUN(__SVFWSCANF, (fp, fmt0, ap),
-       register FILE *fp _AND
-       wchar_t _CONST *fmt0 _AND
+       register FILE *fp,
+       wchar_t _CONST *fmt0,
        va_list ap)
 {
   return __SVFWSCANF_R (_REENT, fp, fmt0, ap);
@@ -250,9 +250,9 @@ _DEFUN(__SVFWSCANF, (fp, fmt0, ap),
 
 int
 _DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data _AND
-       register FILE *fp   _AND
-       _CONST wchar_t *fmt    _AND
+       struct _reent *data,
+       register FILE *fp,
+       _CONST wchar_t *fmt,
        va_list ap)
 {
   CHECK_INIT(data, fp);
@@ -266,8 +266,8 @@ _DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
  * So, we create our own trimmed-down version.  */
 static wint_t
 _DEFUN(_sungetwc_r, (data, fp, ch),
- struct _reent *data _AND
- wint_t wc           _AND
+ struct _reent *data,
+ wint_t wc,
  register FILE *fp)
 {
   if (wc == WEOF)
@@ -326,7 +326,7 @@ extern int __ssrefill_r _PARAMS ((struct _reent *ptr, register FILE * fp));
 
 static size_t
 _DEFUN(_sfgetwc_r, (ptr, fp),
-       struct _reent * ptr _AND
+       struct _reent * ptr,
        FILE * fp)
 {
   wchar_t wc;
@@ -342,9 +342,9 @@ _DEFUN(_sfgetwc_r, (ptr, fp),
 
 int
 _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       wchar_t _CONST *fmt0   _AND
+       struct _reent *rptr,
+       register FILE *fp,
+       wchar_t _CONST *fmt0,
        va_list ap)
 {
   register wchar_t *fmt = (wchar_t *) fmt0;
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index 85ae286bb..ef2a04e2f 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -106,7 +106,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(viprintf, (fmt, ap),
-       _CONST char *fmt _AND
+       _CONST char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -119,8 +119,8 @@ _DEFUN(viprintf, (fmt, ap),
 
 int
 _DEFUN(_viprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *fmt   _AND
+       struct _reent *ptr,
+       _CONST char *fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 379daa232..569fad91c 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -90,7 +90,7 @@ Supporting OS subroutines required:
 
 int
 _DEFUN(viscanf, (fmt, ap),
-       _CONST char *fmt _AND
+       _CONST char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -103,8 +103,8 @@ _DEFUN(viscanf, (fmt, ap),
 
 int
 _DEFUN(_viscanf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *fmt   _AND
+       struct _reent *ptr,
+       _CONST char *fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 00b8023b7..26671f70c 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -30,7 +30,7 @@
 
 int
 _DEFUN(vprintf, (fmt, ap),
-       _CONST char *fmt _AND
+       _CONST char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -48,8 +48,8 @@ _EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
 
 int
 _DEFUN(_vprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *__restrict fmt   _AND
+       struct _reent *ptr,
+       _CONST char *__restrict fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index 4371e23a7..2506919c4 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -31,7 +31,7 @@
 
 int
 _DEFUN(vscanf, (fmt, ap),
-       _CONST char *fmt _AND
+       _CONST char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -49,8 +49,8 @@ _EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
 
 int
 _DEFUN(_vscanf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *__restrict fmt   _AND
+       struct _reent *ptr,
+       _CONST char *__restrict fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vsiprintf.c b/newlib/libc/stdio/vsiprintf.c
index 150b4e7d0..ff83b7856 100644
--- a/newlib/libc/stdio/vsiprintf.c
+++ b/newlib/libc/stdio/vsiprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(vsiprintf, (str, fmt, ap),
-       char *str        _AND
-       const char *fmt _AND
+       char *str,
+       const char *fmt,
        va_list ap)
 {
   return _vsiprintf_r (_REENT, str, fmt, ap);
@@ -43,9 +43,9 @@ _DEFUN(vsiprintf, (str, fmt, ap),
 
 int
 _DEFUN(_vsiprintf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND
-       char *str          _AND
-       const char *fmt   _AND
+       struct _reent *ptr,
+       char *str,
+       const char *fmt,
        va_list ap)
 {
   int ret;
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index 01295995e..cf5120fa3 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -36,8 +36,8 @@
 
 int
 _DEFUN(vsiscanf, (str, fmt, ap),
-       _CONST char *str _AND
-       _CONST char *fmt _AND
+       _CONST char *str,
+       _CONST char *fmt,
        va_list ap)
 {
   return _vsiscanf_r (_REENT, str, fmt, ap);
@@ -47,9 +47,9 @@ _DEFUN(vsiscanf, (str, fmt, ap),
 
 int
 _DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *str   _AND
-       _CONST char *fmt   _AND
+       struct _reent *ptr,
+       _CONST char *str,
+       _CONST char *fmt,
        va_list ap)
 {
   FILE f;
diff --git a/newlib/libc/stdio/vsniprintf.c b/newlib/libc/stdio/vsniprintf.c
index c4305c1a9..e60f779ca 100644
--- a/newlib/libc/stdio/vsniprintf.c
+++ b/newlib/libc/stdio/vsniprintf.c
@@ -33,9 +33,9 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(vsniprintf, (str, size, fmt, ap),
-       char *str        _AND
-       size_t size      _AND
-       const char *fmt _AND
+       char *str,
+       size_t size,
+       const char *fmt,
        va_list ap)
 {
   return _vsniprintf_r (_REENT, str, size, fmt, ap);
@@ -45,10 +45,10 @@ _DEFUN(vsniprintf, (str, size, fmt, ap),
 
 int
 _DEFUN(_vsniprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr _AND
-       char *str          _AND
-       size_t size        _AND
-       const char *fmt   _AND
+       struct _reent *ptr,
+       char *str,
+       size_t size,
+       const char *fmt,
        va_list ap)
 {
   int ret;
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index e08f267bd..dda45256a 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -33,9 +33,9 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(vsnprintf, (str, size, fmt, ap),
-       char *__restrict str        _AND
-       size_t size      _AND
-       const char *__restrict fmt _AND
+       char *__restrict str,
+       size_t size,
+       const char *__restrict fmt,
        va_list ap)
 {
   return _vsnprintf_r (_REENT, str, size, fmt, ap);
@@ -51,10 +51,10 @@ _EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
 
 int
 _DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr _AND
-       char *__restrict str          _AND
-       size_t size        _AND
-       const char *__restrict fmt   _AND
+       struct _reent *ptr,
+       char *__restrict str,
+       size_t size,
+       const char *__restrict fmt,
        va_list ap)
 {
   int ret;
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 742cde0df..4940b974e 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(vsprintf, (str, fmt, ap),
-       char *__restrict str        _AND
-       const char *__restrict fmt _AND
+       char *__restrict str,
+       const char *__restrict fmt,
        va_list ap)
 {
   return _vsprintf_r (_REENT, str, fmt, ap);
@@ -49,9 +49,9 @@ _EXFUN(vsiprintf, (char *, const char *, __VALIST)
 
 int
 _DEFUN(_vsprintf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND
-       char *__restrict str          _AND
-       const char *__restrict fmt   _AND
+       struct _reent *ptr,
+       char *__restrict str,
+       const char *__restrict fmt,
        va_list ap)
 {
   int ret;
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 1660fa1cf..706461d47 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -36,8 +36,8 @@
 
 int
 _DEFUN(vsscanf, (str, fmt, ap),
-       _CONST char *__restrict str _AND
-       _CONST char *__restrict fmt _AND
+       _CONST char *__restrict str,
+       _CONST char *__restrict fmt,
        va_list ap)
 {
   return _vsscanf_r (_REENT, str, fmt, ap);
@@ -53,9 +53,9 @@ _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
 
 int
 _DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *__restrict str   _AND
-       _CONST char *__restrict fmt   _AND
+       struct _reent *ptr,
+       _CONST char *__restrict str,
+       _CONST char *__restrict fmt,
        va_list ap)
 {
   FILE f;
diff --git a/newlib/libc/stdio/vswprintf.c b/newlib/libc/stdio/vswprintf.c
index ac321b662..9c9127cd6 100644
--- a/newlib/libc/stdio/vswprintf.c
+++ b/newlib/libc/stdio/vswprintf.c
@@ -32,10 +32,10 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr _AND
-       wchar_t *str          _AND
-       size_t size        _AND
-       const wchar_t *fmt   _AND
+       struct _reent *ptr,
+       wchar_t *str,
+       size_t size,
+       const wchar_t *fmt,
        va_list ap)
 {
   int ret;
@@ -71,9 +71,9 @@ _DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
 
 int
 _DEFUN(vswprintf, (str, size, fmt, ap),
-       wchar_t *__restrict str        _AND
-       size_t size      _AND
-       const wchar_t *__restrict fmt _AND
+       wchar_t *__restrict str,
+       size_t size,
+       const wchar_t *__restrict fmt,
        va_list ap)
 {
   return _vswprintf_r (_REENT, str, size, fmt, ap);
diff --git a/newlib/libc/stdio/vwprintf.c b/newlib/libc/stdio/vwprintf.c
index 51d1df3a9..191fb70c9 100644
--- a/newlib/libc/stdio/vwprintf.c
+++ b/newlib/libc/stdio/vwprintf.c
@@ -27,7 +27,7 @@
 
 int
 _DEFUN(vwprintf, (fmt, ap),
-       _CONST wchar_t *__restrict fmt _AND
+       _CONST wchar_t *__restrict fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -40,8 +40,8 @@ _DEFUN(vwprintf, (fmt, ap),
 
 int
 _DEFUN(_vwprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST wchar_t *fmt   _AND
+       struct _reent *ptr,
+       _CONST wchar_t *fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c
index f9197ea9e..13578ea33 100644
--- a/newlib/libc/stdio/wbuf.c
+++ b/newlib/libc/stdio/wbuf.c
@@ -34,8 +34,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 int
 _DEFUN(__swbuf_r, (ptr, c, fp),
-       struct _reent *ptr _AND
-       register int c _AND
+       struct _reent *ptr,
+       register int c,
        register FILE *fp)
 {
   register int n;
@@ -89,7 +89,7 @@ _DEFUN(__swbuf_r, (ptr, c, fp),
    earlier dynamically built newlib libraries. */
 int
 _DEFUN(__swbuf, (c, fp),
-       register int c _AND
+       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 e05ba1013..99c5696df 100644
--- a/newlib/libc/stdio/wprintf.c
+++ b/newlib/libc/stdio/wprintf.c
@@ -25,7 +25,7 @@
 
 int
 _DEFUN(_wprintf_r, (ptr, fmt),
-       struct _reent *ptr _AND
+       struct _reent *ptr,
        const wchar_t *fmt _DOTS)
 {
   int ret;
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c
index 08ae70f2c..72280d2df 100644
--- a/newlib/libc/stdio/wsetup.c
+++ b/newlib/libc/stdio/wsetup.c
@@ -31,7 +31,7 @@
 
 int
 _DEFUN(__swsetup_r, (ptr, fp),
-       struct _reent *ptr _AND
+       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 f386583ca..1a238f732 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -36,8 +36,8 @@ extern int __sflags ();
 
 FILE *
 _DEFUN (_fdopen64_r, (ptr, fd, mode),
- struct _reent *ptr _AND
- int fd _AND
+ struct _reent *ptr,
+ int fd,
  _CONST char *mode)
 {
   register FILE *fp;
@@ -109,7 +109,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
 
 FILE *
 _DEFUN (fdopen64, (fd, mode),
- int fd _AND
+ 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 a1d0a3724..e2dd28914 100644
--- a/newlib/libc/stdio64/fgetpos64.c
+++ b/newlib/libc/stdio64/fgetpos64.c
@@ -46,8 +46,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN (_fgetpos64_r, (ptr, fp, pos),
- struct _reent * ptr _AND
- FILE * fp _AND
+ struct _reent * ptr,
+ FILE * fp,
  _fpos64_t * pos)
 {
   *pos = (_fpos64_t)_ftello64_r (ptr, fp);
@@ -63,7 +63,7 @@ _DEFUN (_fgetpos64_r, (ptr, fp, pos),
 
 int
 _DEFUN (fgetpos64, (fp, pos),
- FILE * fp _AND
+ 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 60ac73fda..7edb5d807 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -65,8 +65,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 FILE *
 _DEFUN (_fopen64_r, (ptr, file, mode),
- struct _reent *ptr _AND
- _CONST char *file _AND
+ struct _reent *ptr,
+ _CONST char *file,
  _CONST char *mode)
 {
   register FILE *fp;
@@ -118,7 +118,7 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
 
 FILE *
 _DEFUN (fopen64, (file, mode),
- _CONST char *file _AND
+ _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 379462c31..6e42d0e3b 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -76,9 +76,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 FILE *
 _DEFUN (_freopen64_r, (ptr, file, mode, fp),
- struct _reent *ptr _AND
- _CONST char *file _AND
- _CONST char *mode _AND
+ struct _reent *ptr,
+ _CONST char *file,
+ _CONST char *mode,
  register FILE *fp)
 {
   register int f;
@@ -248,8 +248,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
 
 FILE *
 _DEFUN (freopen64, (file, mode, fp),
- _CONST char *file _AND
- _CONST char *mode _AND
+ _CONST char *file,
+ _CONST char *mode,
  register FILE *fp)
 {
   return _freopen64_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 624e91275..8cd11fa67 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -86,9 +86,9 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
 
 _off64_t
 _DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
-     struct _reent *ptr _AND
-     register FILE *fp _AND
-     _off64_t offset _AND
+     struct _reent *ptr,
+     register FILE *fp,
+     _off64_t offset,
      int whence)
 {
   _fpos64_t _EXFNPTR(seekfn, (struct _reent *, void *, _fpos64_t, int));
@@ -343,8 +343,8 @@ dumb:
 
 _off64_t
 _DEFUN (fseeko64, (fp, offset, whence),
-     register FILE *fp _AND
-     _off64_t offset _AND
+     register FILE *fp,
+     _off64_t offset,
      int whence)
 {
   return _fseeko64_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index 83d99627d..9cfc10733 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -42,8 +42,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN (_fsetpos64_r, (ptr, iop, pos),
- struct _reent *ptr _AND
- FILE * iop _AND
+ struct _reent *ptr,
+ FILE * iop,
  _CONST _fpos64_t * pos)
 {
   int x = _fseeko64_r (ptr, iop, (_off64_t)(*pos), SEEK_SET);
@@ -57,7 +57,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
 
 int
 _DEFUN (fsetpos64, (iop, pos),
- FILE * iop _AND
+ 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 c6226d105..3c4663ba4 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -77,7 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 _off64_t
 _DEFUN (_ftello64_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  register FILE * fp)
 {
   _fpos64_t pos;
diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
index dd3b4adc9..813b919bf 100644
--- a/newlib/libc/stdio64/stdio64.c
+++ b/newlib/libc/stdio64/stdio64.c
@@ -27,9 +27,9 @@
 #ifdef __LARGE64_FILES
 _fpos64_t
 _DEFUN(__sseek64, (ptr, cookie, offset, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos64_t offset _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos64_t offset,
        int whence)
 {
   register FILE *fp = (FILE *) cookie;
@@ -48,9 +48,9 @@ _DEFUN(__sseek64, (ptr, cookie, offset, whence),
 
 _READ_WRITE_RETURN_TYPE
 _DEFUN(__swrite64, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char const *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char const *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   register FILE *fp = (FILE *) cookie;
diff --git a/newlib/libc/stdlib/__adjust.c b/newlib/libc/stdlib/__adjust.c
index d5c70758b..7627cc7ac 100644
--- a/newlib/libc/stdlib/__adjust.c
+++ b/newlib/libc/stdlib/__adjust.c
@@ -10,9 +10,9 @@
 
 double
 _DEFUN (__adjust, (ptr, acc, dexp, sign),
- struct _reent *ptr _AND
- double *acc _AND
- int dexp _AND
+ struct _reent *ptr,
+ double *acc,
+ int dexp,
  int sign)
      /* *acc the 64 bit accumulator */
      /* dexp decimal exponent       */
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c
index 0f4aeb8a9..cb4a2682e 100644
--- a/newlib/libc/stdlib/__atexit.c
+++ b/newlib/libc/stdlib/__atexit.c
@@ -65,9 +65,9 @@ static struct _atexit _global_atexit0 = _ATEXIT_INIT;
 int
 _DEFUN (__register_exitproc,
  (type, fn, arg, d),
- int type _AND
- void (*fn) (void) _AND
- void *arg _AND
+ int type,
+ void (*fn) (void),
+ void *arg,
  void *d)
 {
   struct _on_exit_args * args;
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
index 6a809cc4d..e6c1ee643 100644
--- a/newlib/libc/stdlib/__call_atexit.c
+++ b/newlib/libc/stdlib/__call_atexit.c
@@ -66,7 +66,7 @@ register_fini(void)
 
 void
 _DEFUN (__call_exitprocs, (code, d),
- int code _AND _PTR d)
+ int code, _PTR d)
 {
   register struct _atexit *p;
   struct _atexit **lastp;
diff --git a/newlib/libc/stdlib/__ten_mu.c b/newlib/libc/stdlib/__ten_mu.c
index 637197be2..a7fe70caf 100644
--- a/newlib/libc/stdlib/__ten_mu.c
+++ b/newlib/libc/stdlib/__ten_mu.c
@@ -10,7 +10,7 @@
 
 int
 _DEFUN (__ten_mul, (acc, digit),
- double *acc _AND
+ double *acc,
  int digit)
 {
   /*
diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index a6218746c..ba5b46197 100644
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -51,9 +51,9 @@ Supporting OS subroutines required (only if enabled): <<close>>, <<fstat>>,
 /* func can be NULL, in which case no function information is given.  */
 void
 _DEFUN (__assert_func, (file, line, func, failedexpr),
- const char *file _AND
- int line _AND
- const char *func _AND
+ const char *file,
+ int line,
+ const char *func,
  const char *failedexpr)
 {
   fiprintf(stderr,
@@ -67,8 +67,8 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
 
 void
 _DEFUN (__assert, (file, line, failedexpr),
- const char *file _AND
- int line _AND
+ const char *file,
+ int line,
  const char *failedexpr)
 {
    __assert_func (file, line, NULL, failedexpr);
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index ac3b39a0e..936b381bd 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -56,7 +56,7 @@ _DEFUN (atoi, (s),
 
 int
 _DEFUN (_atoi_r, (s),
- struct _reent *ptr _AND
+ 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 8d0e5cd0b..8c2f5560d 100644
--- a/newlib/libc/stdlib/atol.c
+++ b/newlib/libc/stdlib/atol.c
@@ -14,7 +14,7 @@ _DEFUN (atol, (s), _CONST char *s)
 #endif /* !_REENT_ONLY */
 
 long
-_DEFUN (_atol_r, (ptr, s), struct _reent *ptr _AND _CONST char *s)
+_DEFUN (_atol_r, (ptr, s), 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 9d8a64a9c..d0d498349 100644
--- a/newlib/libc/stdlib/atoll.c
+++ b/newlib/libc/stdlib/atoll.c
@@ -78,7 +78,7 @@ _DEFUN(atoll, (str),
 
 long long
 _DEFUN(_atoll_r, (ptr, str),
-       struct _reent *ptr _AND
+       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 3a723783b..dfdb7f5dc 100644
--- a/newlib/libc/stdlib/calloc.c
+++ b/newlib/libc/stdlib/calloc.c
@@ -47,7 +47,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _PTR
 _DEFUN (calloc, (n, size),
- size_t n _AND
+ 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 39a59d53a..c66b28e7d 100644
--- a/newlib/libc/stdlib/cxa_atexit.c
+++ b/newlib/libc/stdlib/cxa_atexit.c
@@ -24,8 +24,8 @@ const void * const __cxa_atexit_dummy = &__on_exit_args;
 int
 _DEFUN (__cxa_atexit,
  (fn, arg, d),
- void (*fn) (void *) _AND
- void *arg _AND
+ void (*fn) (void *),
+ void *arg,
  void *d)
 {
 #ifdef _LITE_EXIT
diff --git a/newlib/libc/stdlib/div.c b/newlib/libc/stdlib/div.c
index a780a2d3a..4d2ffee48 100644
--- a/newlib/libc/stdlib/div.c
+++ b/newlib/libc/stdlib/div.c
@@ -82,7 +82,7 @@ No supporting OS subroutines are required.
 
 div_t
 _DEFUN (div, (num, denom),
- int num _AND
+ int num,
  int denom)
 {
  div_t r;
diff --git a/newlib/libc/stdlib/dtoa.c b/newlib/libc/stdlib/dtoa.c
index c72ffac5e..3b8976435 100644
--- a/newlib/libc/stdlib/dtoa.c
+++ b/newlib/libc/stdlib/dtoa.c
@@ -35,7 +35,7 @@
 static int
 _DEFUN (quorem,
  (b, S),
- _Bigint * b _AND _Bigint * S)
+ _Bigint * b, _Bigint * S)
 {
   int n;
   __Long borrow, y;
@@ -179,12 +179,12 @@ _DEFUN (quorem,
 char *
 _DEFUN (_dtoa_r,
  (ptr, _d, mode, ndigits, decpt, sign, rve),
- struct _reent *ptr _AND
- double _d _AND
- int mode _AND
- int ndigits _AND
- int *decpt _AND
- int *sign _AND
+ struct _reent *ptr,
+ double _d,
+ int mode,
+ int ndigits,
+ int *decpt,
+ int *sign,
  char **rve)
 {
   /* Arguments ndigits, decpt, sign are similar to those
diff --git a/newlib/libc/stdlib/dtoastub.c b/newlib/libc/stdlib/dtoastub.c
index f4929f228..a857c2452 100644
--- a/newlib/libc/stdlib/dtoastub.c
+++ b/newlib/libc/stdlib/dtoastub.c
@@ -10,11 +10,11 @@
 char *
 _DEFUN (__dtoa,
  (d, mode, ndigits, decpt, sign, rve),
- double d _AND
- int mode _AND
- int ndigits _AND
- int *decpt _AND
- int *sign _AND
+ double d,
+ int mode,
+ int ndigits,
+ int *decpt,
+ int *sign,
  char **rve)
 {
   return _dtoa_r (_REENT, d, mode, ndigits, decpt, sign, rve);
diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c
index ee58c9a9a..2326f55ca 100644
--- a/newlib/libc/stdlib/ecvtbuf.c
+++ b/newlib/libc/stdlib/ecvtbuf.c
@@ -59,12 +59,12 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 static void
 _DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode),
- struct _reent *ptr _AND
- char *buf _AND
- double invalue _AND
- int ndigit _AND
- char type _AND
- int dot _AND
+ struct _reent *ptr,
+ char *buf,
+ double invalue,
+ int ndigit,
+ char type,
+ int dot,
  int mode)
 {
   int decpt;
@@ -127,11 +127,11 @@ _DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode),
 
 static void
 _DEFUN (print_e, (ptr, buf, invalue, width, type, dot),
- struct _reent *ptr _AND
- char *buf _AND
- double invalue _AND
- int width _AND
- char type _AND
+ struct _reent *ptr,
+ char *buf,
+ double invalue,
+ int width,
+ char type,
  int dot)
 {
   int sign;
@@ -210,10 +210,10 @@ _DEFUN (print_e, (ptr, buf, invalue, width, type, dot),
 
 char *
 _DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
- double invalue _AND
- int ndigit _AND
- int *decpt _AND
- int *sign _AND
+ double invalue,
+ int ndigit,
+ int *decpt,
+ int *sign,
  char *fcvt_buf)
 {
   struct _reent *reent = _REENT;
@@ -267,10 +267,10 @@ _DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
 
 char *
 _DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
- double invalue _AND
- int ndigit _AND
- int *decpt _AND
- int *sign _AND
+ double invalue,
+ int ndigit,
+ int *decpt,
+ int *sign,
  char *fcvt_buf)
 {
   struct _reent *reent = _REENT;
@@ -318,11 +318,11 @@ _DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
 
 char *
 _DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot),
- struct _reent *ptr _AND
- double invalue _AND
- int ndigit _AND
- char *buf _AND
- char type _AND
+ struct _reent *ptr,
+ double invalue,
+ int ndigit,
+ char *buf,
+ char type,
  int dot)
 {
   char *save = buf;
@@ -426,12 +426,12 @@ _DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot),
 
 char *
 _DEFUN (_dcvt, (ptr, buffer, invalue, precision, width, type, dot),
- struct _reent *ptr _AND
- char *buffer _AND
- double invalue _AND
- int precision _AND
- int width _AND
- char type _AND
+ struct _reent *ptr,
+ char *buffer,
+ double invalue,
+ int precision,
+ int width,
+ char type,
  int dot)
 {
   switch (type)
diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c
index ae6424559..e354bb170 100644
--- a/newlib/libc/stdlib/efgcvt.c
+++ b/newlib/libc/stdlib/efgcvt.c
@@ -104,9 +104,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 char *
 _DEFUN (fcvt, (d, ndigit, decpt, sign),
- double d _AND
- int ndigit _AND
- int *decpt _AND
+ double d,
+ int ndigit,
+ int *decpt,
  int *sign)
 {
   return fcvtbuf (d, ndigit, decpt, sign, NULL);
@@ -114,9 +114,9 @@ _DEFUN (fcvt, (d, ndigit, decpt, sign),
 
 char *
 _DEFUN (fcvtf, (d, ndigit, decpt, sign),
- float d _AND
- int ndigit _AND
- int *decpt _AND
+ float d,
+ int ndigit,
+ int *decpt,
  int *sign)
 {
   return fcvt ((float) d, ndigit, decpt, sign);
@@ -125,8 +125,8 @@ _DEFUN (fcvtf, (d, ndigit, decpt, sign),
 
 char *
 _DEFUN (gcvtf, (d, ndigit, buf),
- float d _AND
- int ndigit _AND
+ float d,
+ int ndigit,
  char *buf)
 {
   double asd = d;
@@ -136,9 +136,9 @@ _DEFUN (gcvtf, (d, ndigit, buf),
 
 char *
 _DEFUN (ecvt, (d, ndigit, decpt, sign),
- double d _AND
- int ndigit _AND
- int *decpt _AND
+ double d,
+ int ndigit,
+ int *decpt,
  int *sign)
 {
   return ecvtbuf (d, ndigit, decpt, sign, NULL);
@@ -146,9 +146,9 @@ _DEFUN (ecvt, (d, ndigit, decpt, sign),
 
 char *
 _DEFUN (ecvtf, (d, ndigit, decpt, sign),
- float d _AND
- int ndigit _AND
- int *decpt _AND
+ float d,
+ int ndigit,
+ int *decpt,
  int *sign)
 {
   return ecvt ((double) d, ndigit, decpt, sign);
@@ -157,8 +157,8 @@ _DEFUN (ecvtf, (d, ndigit, decpt, sign),
 
 char *
 _DEFUN (gcvt, (d, ndigit, buf),
- double d _AND
- int ndigit _AND
+ double d,
+ int ndigit,
  char *buf)
 {
   char *tbuf = buf;
diff --git a/newlib/libc/stdlib/erand48.c b/newlib/libc/stdlib/erand48.c
index 26b39fb5b..a62ff345a 100644
--- a/newlib/libc/stdlib/erand48.c
+++ b/newlib/libc/stdlib/erand48.c
@@ -15,7 +15,7 @@
 
 double
 _DEFUN (_erand48_r, (r, xseed),
-       struct _reent *r _AND
+       struct _reent *r,
        unsigned short xseed[3])
 {
   __dorand48(r, xseed);
diff --git a/newlib/libc/stdlib/gdtoa-gethex.c b/newlib/libc/stdlib/gdtoa-gethex.c
index fd3903c4f..931ced3a7 100644
--- a/newlib/libc/stdlib/gdtoa-gethex.c
+++ b/newlib/libc/stdlib/gdtoa-gethex.c
@@ -71,7 +71,7 @@ _DEFUN (__hexdig_fun, (c),
 
 static void
 _DEFUN(rshift, (b, k),
- _Bigint *b _AND
+ _Bigint *b,
  int k)
 {
  __ULong *x, *x1, *xe, y;
@@ -102,7 +102,7 @@ _DEFUN(rshift, (b, k),
 
 static _Bigint *
 _DEFUN (increment, (ptr, b),
- struct _reent *ptr _AND
+ 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 24e3783be..22033d90f 100644
--- a/newlib/libc/stdlib/gdtoa-hexnan.c
+++ b/newlib/libc/stdlib/gdtoa-hexnan.c
@@ -46,7 +46,7 @@ THIS SOFTWARE.
 #ifdef INFNAN_CHECK
 int
 _DEFUN (match, (sp, t),
- _CONST char **sp _AND
+ _CONST char **sp,
  char *t)
 {
  int c, d;
@@ -64,8 +64,8 @@ _DEFUN (match, (sp, t),
 
 static void
 _DEFUN (L_shift, (x, x1, i),
- __ULong *x _AND
- __ULong *x1 _AND
+ __ULong *x,
+ __ULong *x1,
  int i)
 {
  int j;
@@ -81,8 +81,8 @@ _DEFUN (L_shift, (x, x1, i),
 
 int
 _DEFUN (hexnan, (sp, fpi, x0),
- _CONST char **sp _AND
- _CONST FPI *fpi _AND
+ _CONST char **sp,
+ _CONST FPI *fpi,
  __ULong *x0)
 {
  __ULong c, h, *x, *x1, *xe;
diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c
index c64241ee6..2d394e240 100644
--- a/newlib/libc/stdlib/getenv.c
+++ b/newlib/libc/stdlib/getenv.c
@@ -65,7 +65,7 @@ variables vary from one system to another.
 
 char *
 _DEFUN (_findenv, (name, offset),
- register _CONST char *name _AND
+ register _CONST char *name,
  int *offset)
 {
   return _findenv_r (_REENT, name, offset);
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index 7376f7407..b34c2a9b3 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -75,8 +75,8 @@ static char ***p_environ = &environ;
 
 char *
 _DEFUN (_findenv_r, (reent_ptr, name, offset),
-        struct _reent *reent_ptr   _AND
- register _CONST char *name _AND
+        struct _reent *reent_ptr,
+ register _CONST char *name,
  int *offset)
 {
   register int len;
@@ -120,7 +120,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset),
 
 char *
 _DEFUN (_getenv_r, (reent_ptr, name),
-        struct _reent *reent_ptr _AND
+        struct _reent *reent_ptr,
  _CONST char *name)
 {
   int offset;
diff --git a/newlib/libc/stdlib/itoa.c b/newlib/libc/stdlib/itoa.c
index 3178cd454..25e6c3516 100644
--- a/newlib/libc/stdlib/itoa.c
+++ b/newlib/libc/stdlib/itoa.c
@@ -31,8 +31,8 @@ No supporting OS subroutine calls are required.
 
 char *
 _DEFUN (__itoa, (value, str, base),
-        int value _AND
-        char *str _AND
+        int value,
+        char *str,
         int base)
 {
   unsigned uvalue;
@@ -61,8 +61,8 @@ _DEFUN (__itoa, (value, str, base),
 
 char *  
 _DEFUN (itoa, (value, str, base),
-        int value _AND
-        char *str _AND
+        int value,
+        char *str,
         int base)
 {
   return __itoa (value, str, base);
diff --git a/newlib/libc/stdlib/jrand48.c b/newlib/libc/stdlib/jrand48.c
index 9e2f92cb6..4f8c12bd1 100644
--- a/newlib/libc/stdlib/jrand48.c
+++ b/newlib/libc/stdlib/jrand48.c
@@ -15,7 +15,7 @@
 
 long
 _DEFUN (_jrand48_r, (r, xseed),
-       struct _reent *r _AND
+       struct _reent *r,
        unsigned short xseed[3])
 {
   __dorand48(r, xseed);
diff --git a/newlib/libc/stdlib/l64a.c b/newlib/libc/stdlib/l64a.c
index d415d0478..607842723 100644
--- a/newlib/libc/stdlib/l64a.c
+++ b/newlib/libc/stdlib/l64a.c
@@ -35,7 +35,7 @@ _DEFUN (l64a, (value),
 
 char *
 _DEFUN (_l64a_r, (rptr, value),
-     struct _reent *rptr _AND
+     struct _reent *rptr,
      long value)
 {
   char *ptr;
diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c
index 548f32757..f40dede82 100644
--- a/newlib/libc/stdlib/lcong48.c
+++ b/newlib/libc/stdlib/lcong48.c
@@ -15,7 +15,7 @@
 
 _VOID
 _DEFUN (_lcong48_r, (r, p),
-       struct _reent *r _AND
+       struct _reent *r,
        unsigned short p[7])
 {
   _REENT_CHECK_RAND48(r);
diff --git a/newlib/libc/stdlib/ldiv.c b/newlib/libc/stdlib/ldiv.c
index 242b6bd87..00bca6286 100644
--- a/newlib/libc/stdlib/ldiv.c
+++ b/newlib/libc/stdlib/ldiv.c
@@ -83,7 +83,7 @@ No supporting OS subroutines are required.
 
 ldiv_t
 _DEFUN (ldiv, (num, denom),
-        long num _AND
+        long num,
         long denom)
 {
  ldiv_t r;
diff --git a/newlib/libc/stdlib/lldiv.c b/newlib/libc/stdlib/lldiv.c
index 61a9b50ca..8433e76bd 100644
--- a/newlib/libc/stdlib/lldiv.c
+++ b/newlib/libc/stdlib/lldiv.c
@@ -95,7 +95,7 @@ No supporting OS subroutines are required.
  */
 lldiv_t
 _DEFUN (lldiv, (number, denom),
-       long long numer _AND long long denom)
+       long long numer, long long denom)
 {
  lldiv_t retval;
 
diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c
index 1eded306b..d36846f98 100644
--- a/newlib/libc/stdlib/malign.c
+++ b/newlib/libc/stdlib/malign.c
@@ -10,7 +10,7 @@
 
 _PTR
 _DEFUN (memalign, (align, nbytes),
- size_t align _AND
+ size_t align,
  size_t nbytes)
 {
   return _memalign_r (_REENT, align, nbytes);
diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c
index 30d759be0..3ea91f4ba 100644
--- a/newlib/libc/stdlib/mblen.c
+++ b/newlib/libc/stdlib/mblen.c
@@ -44,7 +44,7 @@ effects vary with the locale.
 
 int
 _DEFUN (mblen, (s, n),
-        const char *s _AND
+        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 5e58e1e45..1456ceae2 100644
--- a/newlib/libc/stdlib/mblen_r.c
+++ b/newlib/libc/stdlib/mblen_r.c
@@ -42,9 +42,9 @@ effects vary with the locale.
 
 int
 _DEFUN (_mblen_r, (r, s, n, state),
-        struct _reent *r    _AND
-        const char *s _AND
-        size_t n _AND
+        struct _reent *r,
+        const char *s,
+        size_t n,
         mbstate_t *state)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c
index 69e3acb62..4ca2143cf 100644
--- a/newlib/libc/stdlib/mbrtowc.c
+++ b/newlib/libc/stdlib/mbrtowc.c
@@ -9,10 +9,10 @@
 
 size_t
 _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
- struct _reent *ptr _AND
- wchar_t *pwc _AND
- const char *s _AND
- size_t n _AND
+ struct _reent *ptr,
+ wchar_t *pwc,
+ const char *s,
+ size_t n,
  mbstate_t *ps)
 {
   int retval = 0;
@@ -43,9 +43,9 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (mbrtowc, (pwc, s, n, ps),
- wchar_t *__restrict pwc _AND
- const char *__restrict s _AND
- size_t n _AND
+ wchar_t *__restrict pwc,
+ const char *__restrict s,
+ size_t n,
  mbstate_t *__restrict ps)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/stdlib/mbsnrtowcs.c b/newlib/libc/stdlib/mbsnrtowcs.c
index 018f075ee..206a0623e 100644
--- a/newlib/libc/stdlib/mbsnrtowcs.c
+++ b/newlib/libc/stdlib/mbsnrtowcs.c
@@ -72,11 +72,11 @@ PORTABILITY
 
 size_t
 _DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps),
- struct _reent *r _AND
- wchar_t *dst _AND
- const char **src _AND
- size_t nms _AND
- size_t len _AND
+ struct _reent *r,
+ wchar_t *dst,
+ const char **src,
+ size_t nms,
+ size_t len,
  mbstate_t *ps)
 {
   wchar_t *ptr = dst;
@@ -138,10 +138,10 @@ _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 _AND
- const char **__restrict src _AND
- size_t nms _AND
- size_t len _AND
+ wchar_t *__restrict dst,
+ const char **__restrict src,
+ size_t nms,
+ size_t len,
  mbstate_t *__restrict ps)
 {
   return _mbsnrtowcs_r (_REENT, dst, src, nms, len, ps);
diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
index 65e46d32e..48d36d028 100644
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ b/newlib/libc/stdlib/mbsrtowcs.c
@@ -9,10 +9,10 @@
 
 size_t
 _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps),
- struct _reent *r _AND
- wchar_t *dst _AND
- const char **src _AND
- size_t len _AND
+ struct _reent *r,
+ wchar_t *dst,
+ const char **src,
+ size_t len,
  mbstate_t *ps)
 {
   return _mbsnrtowcs_r (r, dst, src, (size_t) -1, len, ps);
@@ -21,9 +21,9 @@ _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (mbsrtowcs, (dst, src, len, ps),
- wchar_t *__restrict dst _AND
- const char **__restrict src _AND
- size_t len _AND
+ wchar_t *__restrict dst,
+ const char **__restrict src,
+ size_t len,
  mbstate_t *__restrict ps)
 {
   return _mbsnrtowcs_r (_REENT, dst, src, (size_t) -1, len, ps);
diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index 70ed9ede6..41ad7b67a 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -48,8 +48,8 @@ effects vary with the locale.
 
 size_t
 _DEFUN (mbstowcs, (pwcs, s, n),
-        wchar_t *__restrict pwcs _AND
-        const char *__restrict s _AND
+        wchar_t *__restrict pwcs,
+        const char *__restrict s,
         size_t n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c
index 495049972..7c95e4aba 100644
--- a/newlib/libc/stdlib/mbstowcs_r.c
+++ b/newlib/libc/stdlib/mbstowcs_r.c
@@ -4,10 +4,10 @@
 
 size_t
 _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
-        struct _reent *r    _AND        
-        wchar_t       *__restrict pwcs _AND
-        const char    *__restrict s    _AND
-        size_t         n    _AND
+        struct _reent *r,
+        wchar_t       *__restrict pwcs,
+        const char    *__restrict s,
+        size_t         n,
         mbstate_t     *state)
 {
   size_t ret = 0;
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c
index 0c29cf3d9..182884aab 100644
--- a/newlib/libc/stdlib/mbtowc.c
+++ b/newlib/libc/stdlib/mbtowc.c
@@ -51,8 +51,8 @@ effects vary with the locale.
 
 int
 _DEFUN (mbtowc, (pwc, s, n),
-        wchar_t *__restrict pwc _AND
-        const char *__restrict s _AND
+        wchar_t *__restrict pwc,
+        const char *__restrict s,
         size_t n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
index 9d782566f..cbc534a7b 100644
--- a/newlib/libc/stdlib/mbtowc_r.c
+++ b/newlib/libc/stdlib/mbtowc_r.c
@@ -9,10 +9,10 @@
 
 int
 _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
-        struct _reent *r   _AND
-        wchar_t       *__restrict pwc _AND
-        const char    *__restrict s   _AND        
-        size_t         n   _AND
+        struct _reent *r,
+        wchar_t       *__restrict pwc,
+        const char    *__restrict s,
+        size_t         n,
         mbstate_t      *state)
 {
   return __MBTOWC (r, pwc, s, n, state);
@@ -20,10 +20,10 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
 
 int
 _DEFUN (__ascii_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r       _AND
-        wchar_t       *pwc     _AND
-        const char    *s       _AND        
-        size_t         n       _AND
+        struct _reent *r,
+        wchar_t       *pwc,
+        const char    *s,
+        size_t         n,
         mbstate_t      *state)
 {
   wchar_t dummy;
@@ -529,10 +529,10 @@ __cp_mbtowc (int val)
 
 int
 _DEFUN (__utf8_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r       _AND
-        wchar_t       *pwc     _AND
-        const char    *s       _AND        
-        size_t         n       _AND
+        struct _reent *r,
+        wchar_t       *pwc,
+        const char    *s,
+        size_t         n,
         mbstate_t      *state)
 {
   wchar_t dummy;
@@ -731,10 +731,10 @@ _DEFUN (__utf8_mbtowc, (r, pwc, s, n, state),
 #ifndef  __CYGWIN__
 int
 _DEFUN (__sjis_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r       _AND
-        wchar_t       *pwc     _AND
-        const char    *s       _AND        
-        size_t         n       _AND
+        struct _reent *r,
+        wchar_t       *pwc,
+        const char    *s,
+        size_t         n,
         mbstate_t      *state)
 {
   wchar_t dummy;
@@ -788,10 +788,10 @@ _DEFUN (__sjis_mbtowc, (r, pwc, s, n, state),
 
 int
 _DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r       _AND
-        wchar_t       *pwc     _AND
-        const char    *s       _AND        
-        size_t         n       _AND
+        struct _reent *r,
+        wchar_t       *pwc,
+        const char    *s,
+        size_t         n,
         mbstate_t      *state)
 {
   wchar_t dummy;
@@ -871,10 +871,10 @@ _DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state),
 
 int
 _DEFUN (__jis_mbtowc, (r, pwc, s, n, state),
-        struct _reent *r       _AND
-        wchar_t       *pwc     _AND
-        const char    *s       _AND        
-        size_t         n       _AND
+        struct _reent *r,
+        wchar_t       *pwc,
+        const char    *s,
+        size_t         n,
         mbstate_t      *state)
 {
   wchar_t dummy;
diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c
index 2b982ef55..cb6866d50 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 _AND int k)
+_DEFUN (Balloc, (ptr, k), struct _reent *ptr, int k)
 {
   int x;
   _Bigint *rv ;
@@ -133,7 +133,7 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k)
 }
 
 void
-_DEFUN (Bfree, (ptr, v), struct _reent *ptr _AND _Bigint * v)
+_DEFUN (Bfree, (ptr, v), struct _reent *ptr, _Bigint * v)
 {
   _REENT_CHECK_MP(ptr);
   if (v)
@@ -145,9 +145,9 @@ _DEFUN (Bfree, (ptr, v), struct _reent *ptr _AND _Bigint * v)
 
 _Bigint *
 _DEFUN (multadd, (ptr, b, m, a),
- struct _reent *ptr _AND
- _Bigint * b _AND
- int m _AND
+ struct _reent *ptr,
+ _Bigint * b,
+ int m,
  int a)
 {
   int i, wds;
@@ -192,10 +192,10 @@ _DEFUN (multadd, (ptr, b, m, a),
 
 _Bigint *
 _DEFUN (s2b, (ptr, s, nd0, nd, y9),
- struct _reent * ptr _AND
- _CONST char *s _AND
- int nd0 _AND
- int nd _AND
+ struct _reent * ptr,
+ _CONST char *s,
+ int nd0,
+ int nd,
  __ULong y9)
 {
   _Bigint *b;
@@ -316,7 +316,7 @@ _DEFUN (lo0bits, (y), __ULong *y)
 }
 
 _Bigint *
-_DEFUN (i2b, (ptr, i), struct _reent * ptr _AND int i)
+_DEFUN (i2b, (ptr, i), struct _reent * ptr, int i)
 {
   _Bigint *b;
 
@@ -327,7 +327,7 @@ _DEFUN (i2b, (ptr, i), struct _reent * ptr _AND int i)
 }
 
 _Bigint *
-_DEFUN (mult, (ptr, a, b), struct _reent * ptr _AND _Bigint * a _AND _Bigint * b)
+_DEFUN (mult, (ptr, a, b), struct _reent * ptr, _Bigint * a, _Bigint * b)
 {
   _Bigint *c;
   int k, wa, wb, wc;
@@ -420,7 +420,7 @@ _DEFUN (mult, (ptr, a, b), struct _reent * ptr _AND _Bigint * a _AND _Bigint * b
 
 _Bigint *
 _DEFUN (pow5mult,
- (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k)
+ (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
 {
   _Bigint *b1, *p5, *p51;
   int i;
@@ -459,7 +459,7 @@ _DEFUN (pow5mult,
 }
 
 _Bigint *
-_DEFUN (lshift, (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k)
+_DEFUN (lshift, (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
 {
   int i, k1, n, n1;
   _Bigint *b1;
@@ -519,7 +519,7 @@ _DEFUN (lshift, (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k)
 }
 
 int
-_DEFUN (cmp, (a, b), _Bigint * a _AND _Bigint * b)
+_DEFUN (cmp, (a, b), _Bigint * a, _Bigint * b)
 {
   __ULong *xa, *xa0, *xb, *xb0;
   int i, j;
@@ -549,8 +549,8 @@ _DEFUN (cmp, (a, b), _Bigint * a _AND _Bigint * b)
 }
 
 _Bigint *
-_DEFUN (diff, (ptr, a, b), struct _reent * ptr _AND
- _Bigint * a _AND _Bigint * b)
+_DEFUN (diff, (ptr, a, b), struct _reent * ptr,
+ _Bigint * a, _Bigint * b)
 {
   _Bigint *c;
   int i, wa, wb;
@@ -680,7 +680,7 @@ _DEFUN (ulp, (_x), double _x)
 
 double
 _DEFUN (b2d, (a, e),
- _Bigint * a _AND int *e)
+ _Bigint * a, int *e)
 {
   __ULong *xa, *xa0, w, y, z;
   int k;
@@ -758,9 +758,9 @@ ret_d:
 _Bigint *
 _DEFUN (d2b,
  (ptr, _d, e, bits),
- struct _reent * ptr _AND
- double _d _AND
- int *e _AND
+ struct _reent * ptr,
+ double _d,
+ int *e,
  int *bits)
 
 {
@@ -911,7 +911,7 @@ _DEFUN (d2b,
 #undef d1
 
 double
-_DEFUN (ratio, (a, b), _Bigint * a _AND _Bigint * b)
+_DEFUN (ratio, (a, b), _Bigint * a, _Bigint * b)
 
 {
   union double_union da, db;
@@ -992,8 +992,8 @@ _DEFUN (_mprec_log10, (dig),
 
 void
 _DEFUN (copybits, (c, n, b),
- __ULong *c _AND
- int n _AND
+ __ULong *c,
+ int n,
  _Bigint *b)
 {
  __ULong *ce, *x, *xe;
@@ -1021,7 +1021,7 @@ _DEFUN (copybits, (c, n, b),
 
 __ULong
 _DEFUN (any_on, (b, k),
- _Bigint *b _AND
+ _Bigint *b,
  int k)
 {
  int n, nwds;
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index 88cb54c40..b7aa93b28 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -98,7 +98,7 @@ _DEFUN_VOID (malloc_stats)
 
 int
 _DEFUN (mallopt, (p, v),
- int p _AND
+ int p,
  int v)
 {
   return _mallopt_r (_REENT, p, v);
@@ -116,7 +116,7 @@ _DEFUN (mallopt, (p, v),
 
 void
 _DEFUN (_mstats_r, (ptr, s),
- struct _reent *ptr _AND
+ struct _reent *ptr,
  char *s)
 {
   _REENT_SMALL_CHECK_INIT(ptr);
diff --git a/newlib/libc/stdlib/nrand48.c b/newlib/libc/stdlib/nrand48.c
index 39e9fb13c..43a6d0cfb 100644
--- a/newlib/libc/stdlib/nrand48.c
+++ b/newlib/libc/stdlib/nrand48.c
@@ -15,7 +15,7 @@
 
 long
 _DEFUN (_nrand48_r, (r, xseed),
-       struct _reent *r _AND
+       struct _reent *r,
        unsigned short xseed[3])
 {
   __dorand48 (r, xseed);
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index d22fc3728..b21cf0cb2 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -68,7 +68,7 @@ const void * const __on_exit_dummy = &__on_exit_args;
 int
 _DEFUN (on_exit,
  (fn, arg),
- _VOID _EXFNPTR(fn, (int, _PTR)) _AND
+ _VOID _EXFNPTR(fn, (int, _PTR)),
         _PTR arg)
 {
   return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
diff --git a/newlib/libc/stdlib/putenv_r.c b/newlib/libc/stdlib/putenv_r.c
index a0f476721..a780a149e 100644
--- a/newlib/libc/stdlib/putenv_r.c
+++ b/newlib/libc/stdlib/putenv_r.c
@@ -32,7 +32,7 @@
                with "value" which is specified by str as "name=value". */
 int
 _DEFUN (_putenv_r, (reent_ptr, str),
- struct _reent *reent_ptr _AND
+ struct _reent *reent_ptr,
  char   *str)
 {
   register char *p, *equal;
diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c
index b9bf320b2..0fc5cc0a9 100644
--- a/newlib/libc/stdlib/rand48.c
+++ b/newlib/libc/stdlib/rand48.c
@@ -131,7 +131,7 @@ No supporting OS subroutines are required.
 
 void
 _DEFUN (__dorand48, (r, xseed),
-       struct _reent *r _AND
+       struct _reent *r,
        unsigned short xseed[3])
 {
   unsigned long accu;
diff --git a/newlib/libc/stdlib/realloc.c b/newlib/libc/stdlib/realloc.c
index 0cdbdb619..8258e211e 100644
--- a/newlib/libc/stdlib/realloc.c
+++ b/newlib/libc/stdlib/realloc.c
@@ -12,7 +12,7 @@ int _dummy_realloc = 1;
 
 _PTR
 _DEFUN (realloc, (ap, nbytes),
- _PTR ap _AND
+ _PTR 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 a9d329398..b3f1b2aab 100644
--- a/newlib/libc/stdlib/reallocf.c
+++ b/newlib/libc/stdlib/reallocf.c
@@ -32,8 +32,8 @@
 
 _PTR
 _DEFUN (_reallocf_r, (reentptr, ptr, size),
- struct _reent *reentptr _AND
- _PTR ptr _AND
+ struct _reent *reentptr,
+ _PTR ptr,
  size_t size)
 {
  void *nptr;
@@ -47,7 +47,7 @@ _DEFUN (_reallocf_r, (reentptr, ptr, size),
 #ifndef _REENT_ONLY
 _PTR
 _DEFUN (reallocf, (ptr, size),
- _PTR ptr _AND
+ _PTR ptr,
  size_t size)
 {
   return _reallocf_r(_REENT, ptr, size);
diff --git a/newlib/libc/stdlib/seed48.c b/newlib/libc/stdlib/seed48.c
index 43629cc40..5f3ae2e95 100644
--- a/newlib/libc/stdlib/seed48.c
+++ b/newlib/libc/stdlib/seed48.c
@@ -15,7 +15,7 @@
 
 unsigned short *
 _DEFUN (_seed48_r, (r, xseed),
-       struct _reent *r _AND
+       struct _reent *r,
        unsigned short xseed[3])
 {
   static unsigned short sseed[3];
diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c
index d423678f3..7e8949417 100644
--- a/newlib/libc/stdlib/setenv.c
+++ b/newlib/libc/stdlib/setenv.c
@@ -33,8 +33,8 @@ extern int _unsetenv_r _PARAMS ((struct _reent *, const char *));
 
 int
 _DEFUN (setenv, (name, value, rewrite),
- _CONST char *name _AND
- _CONST char *value _AND
+ _CONST char *name,
+ _CONST char *value,
  int rewrite)
 {
   return _setenv_r (_REENT, name, value, rewrite);
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index c32c6aca9..75f21733e 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -50,9 +50,9 @@ extern char *_findenv_r _PARAMS ((struct _reent *, const char *, int *));
 
 int
 _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
-        struct _reent *reent_ptr _AND
- _CONST char *name _AND
- _CONST char *value _AND
+        struct _reent *reent_ptr,
+ _CONST char *name,
+ _CONST char *value,
  int rewrite)
 {
   static int alloced; /* if allocated space before */
@@ -134,7 +134,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
  */
 int
 _DEFUN (_unsetenv_r, (reent_ptr, name),
-        struct _reent *reent_ptr _AND
+        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 69bdbfc3b..7042e834c 100644
--- a/newlib/libc/stdlib/srand48.c
+++ b/newlib/libc/stdlib/srand48.c
@@ -15,7 +15,7 @@
 
 _VOID
 _DEFUN (_srand48_r, (r, seed),
-       struct _reent *r _AND
+       struct _reent *r,
        long seed)
 {
   _REENT_CHECK_RAND48(r);
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 236daa5f6..e3c9b7f17 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -175,7 +175,7 @@ static _CONST double tinytens[] = { 1e-16, 1e-32,
 #ifdef Avoid_Underflow /*{*/
  static double
 _DEFUN (sulp, (x, scale),
-       U x _AND
+       U x,
  int scale)
 {
         U u;
@@ -198,9 +198,9 @@ _DEFUN (sulp, (x, scale),
 
 static void
 _DEFUN (ULtod, (L, bits, exp, k),
- __ULong *L _AND
- __ULong *bits _AND
- Long exp _AND
+ __ULong *L,
+ __ULong *bits,
+ Long exp,
  int k)
 {
  switch(k & STRTOG_Retmask) {
@@ -1253,8 +1253,8 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
 
 double
 _DEFUN (_strtod_r, (ptr, s00, se),
- struct _reent *ptr _AND
- _CONST char *__restrict s00 _AND
+ struct _reent *ptr,
+ _CONST char *__restrict s00,
  char **__restrict se)
 {
   return _strtod_l (ptr, s00, se, __get_current_locale ());
@@ -1270,7 +1270,7 @@ strtod_l (const char *__restrict s00, char **__restrict se, locale_t loc)
 
 double
 _DEFUN (strtod, (s00, se),
- _CONST char *__restrict s00 _AND char **__restrict se)
+ _CONST char *__restrict s00, char **__restrict se)
 {
   return _strtod_l (_REENT, s00, se, __get_current_locale ());
 }
@@ -1291,7 +1291,7 @@ strtof_l (const char *__restrict s00, char **__restrict se, locale_t loc)
 
 float
 _DEFUN (strtof, (s00, se),
- _CONST char *__restrict s00 _AND
+ _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 ba58b6e8c..7ffa6a95d 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -213,9 +213,9 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
 
 long
 _DEFUN (_strtol_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST char *__restrict nptr _AND
- char **__restrict endptr _AND
+ struct _reent *rptr,
+ _CONST char *__restrict nptr,
+ char **__restrict endptr,
  int base)
 {
  return _strtol_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -232,8 +232,8 @@ strtol_l (const char *__restrict s, char **__restrict ptr, int base,
 
 long
 _DEFUN (strtol, (s, ptr, base),
- _CONST char *__restrict s _AND
- char **__restrict ptr _AND
+ _CONST char *__restrict s,
+ char **__restrict ptr,
  int base)
 {
  return _strtol_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 2922452c7..51752655a 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -215,9 +215,9 @@ _strtoll_l (struct _reent *rptr, _CONST char *__restrict nptr,
 
 long long
 _DEFUN (_strtoll_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST char *__restrict nptr _AND
- char **__restrict endptr _AND
+ struct _reent *rptr,
+ _CONST char *__restrict nptr,
+ char **__restrict endptr,
  int base)
 {
  return _strtoll_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -234,8 +234,8 @@ strtoll_l (const char *__restrict s, char **__restrict ptr, int base,
 
 long long
 _DEFUN (strtoll, (s, ptr, base),
- _CONST char *__restrict s _AND
- char **__restrict ptr _AND
+ _CONST char *__restrict s,
+ char **__restrict ptr,
  int base)
 {
  return _strtoll_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index 9414661ec..e18472254 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -192,9 +192,9 @@ _strtoul_l (struct _reent *rptr, const char *__restrict nptr,
 
 unsigned long
 _DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST char *__restrict nptr _AND
- char **__restrict endptr _AND
+ struct _reent *rptr,
+ _CONST char *__restrict nptr,
+ char **__restrict endptr,
  int base)
 {
   return _strtoul_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -211,8 +211,8 @@ strtoul_l (const char *__restrict s, char **__restrict ptr, int base,
 
 unsigned long
 _DEFUN (strtoul, (s, ptr, base),
- _CONST char *__restrict s _AND
- char **__restrict ptr _AND
+ _CONST char *__restrict s,
+ char **__restrict ptr,
  int base)
 {
  return _strtoul_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index aff1fc7c3..4dfb28f79 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -190,9 +190,9 @@ _strtoull_l (struct _reent *rptr, const char *__restrict nptr,
 
 unsigned long long
 _DEFUN (_strtoull_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST char *__restrict nptr _AND
- char **__restrict endptr _AND
+ struct _reent *rptr,
+ _CONST char *__restrict nptr,
+ char **__restrict endptr,
  int base)
 {
  return _strtoull_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -209,8 +209,8 @@ strtoull_l (const char *__restrict s, char **__restrict ptr, int base,
 
 unsigned long long
 _DEFUN (strtoull, (s, ptr, base),
- _CONST char *__restrict s _AND
- char **__restrict ptr _AND
+ _CONST char *__restrict s,
+ char **__restrict ptr,
  int base)
 {
  return _strtoull_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index 6cacfa587..f172e5de9 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -53,12 +53,12 @@ Supporting OS subroutines required: <<_exit>>, <<_execve>>, <<_fork_r>>,
 #include <reent.h>
 
 #if defined (unix) || defined (__CYGWIN__)
-static int _EXFUN(do_system, (struct _reent *ptr _AND _CONST char *s));
+static int _EXFUN(do_system, (struct _reent *ptr, _CONST char *s));
 #endif
 
 int
 _DEFUN(_system_r, (ptr, s),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      _CONST char *s)
 {
 #if defined(HAVE_SYSTEM)
@@ -111,7 +111,7 @@ static char ***p_environ = &environ;
 
 static int
 _DEFUN(do_system, (ptr, s),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      _CONST char *s)
 {
   char *argv[4];
@@ -143,7 +143,7 @@ _DEFUN(do_system, (ptr, s),
 #if defined (__CYGWIN__)
 static int
 _DEFUN(do_system, (ptr, s),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      _CONST char *s)
 {
   char *argv[4];
diff --git a/newlib/libc/stdlib/utoa.c b/newlib/libc/stdlib/utoa.c
index 75e8616ea..cc5440783 100644
--- a/newlib/libc/stdlib/utoa.c
+++ b/newlib/libc/stdlib/utoa.c
@@ -29,8 +29,8 @@ No supporting OS subroutine calls are required.
 
 char *
 _DEFUN (__utoa, (value, str, base),
-        unsigned value _AND
-        char *str _AND
+        unsigned value,
+        char *str,
         int base)
 {
   const char digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
@@ -68,8 +68,8 @@ _DEFUN (__utoa, (value, str, base),
 
 char *  
 _DEFUN (utoa, (value, str, base),
-        unsigned value _AND
-        char *str _AND
+        unsigned value,
+        char *str,
         int base)
 {
   return __utoa (value, str, base);
diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c
index df7741a8c..3b6cbd62c 100644
--- a/newlib/libc/stdlib/wcrtomb.c
+++ b/newlib/libc/stdlib/wcrtomb.c
@@ -8,9 +8,9 @@
 
 size_t
 _DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
- struct _reent *ptr _AND
- char *s _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ char *s,
+ wchar_t wc,
  mbstate_t *ps)
 {
   int retval = 0;
@@ -42,8 +42,8 @@ _DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (wcrtomb, (s, wc, ps),
- char *__restrict s _AND
- wchar_t wc _AND
+ char *__restrict s,
+ wchar_t wc,
  mbstate_t *__restrict ps)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c
index ed5f36968..3561257cb 100644
--- a/newlib/libc/stdlib/wcsnrtombs.c
+++ b/newlib/libc/stdlib/wcsnrtombs.c
@@ -139,11 +139,11 @@ _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 _AND
- char *dst _AND
- const wchar_t **src _AND
- size_t nwc _AND
- size_t len _AND
+ struct _reent *r,
+ char *dst,
+ const wchar_t **src,
+ size_t nwc,
+ size_t len,
  mbstate_t *ps)
 {
   return _wcsnrtombs_l (_REENT, dst, src, nwc, len, ps,
@@ -153,10 +153,10 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (wcsnrtombs, (dst, src, nwc, len, ps),
- char *__restrict dst _AND
- const wchar_t **__restrict src _AND
- size_t nwc _AND
- size_t len _AND
+ char *__restrict dst,
+ const wchar_t **__restrict src,
+ size_t nwc,
+ size_t len,
  mbstate_t *__restrict ps)
 {
   return _wcsnrtombs_l (_REENT, dst, src, nwc, len, ps,
diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c
index 2b6777cae..ac0c9dece 100644
--- a/newlib/libc/stdlib/wcsrtombs.c
+++ b/newlib/libc/stdlib/wcsrtombs.c
@@ -6,10 +6,10 @@
 
 size_t
 _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
- struct _reent *r _AND
- char *dst _AND
- const wchar_t **src _AND
- size_t len _AND
+ struct _reent *r,
+ char *dst,
+ const wchar_t **src,
+ size_t len,
  mbstate_t *ps)
 {
   return _wcsnrtombs_r (r, dst, src, (size_t) -1, len, ps);
@@ -18,9 +18,9 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (wcsrtombs, (dst, src, len, ps),
- char *__restrict dst _AND
- const wchar_t **__restrict src _AND
- size_t len _AND
+ char *__restrict dst,
+ const wchar_t **__restrict src,
+ size_t len,
  mbstate_t *__restrict ps)
 {
   return _wcsnrtombs_r (_REENT, dst, src, (size_t) -1, len, ps);
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 201a2c32c..239f8d2c0 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -215,8 +215,8 @@ _wcstod_l (struct _reent *ptr, const wchar_t *nptr, wchar_t **endptr,
 
 double
 _DEFUN (_wcstod_r, (ptr, nptr, endptr),
- struct _reent *ptr _AND
- _CONST wchar_t *nptr _AND
+ struct _reent *ptr,
+ _CONST wchar_t *nptr,
  wchar_t **endptr)
 {
   return _wcstod_l (ptr, nptr, endptr, __get_current_locale ());
@@ -224,8 +224,8 @@ _DEFUN (_wcstod_r, (ptr, nptr, endptr),
 
 float
 _DEFUN (_wcstof_r, (ptr, nptr, endptr),
- struct _reent *ptr _AND
- _CONST wchar_t *nptr _AND
+ struct _reent *ptr,
+ _CONST wchar_t *nptr,
  wchar_t **endptr)
 {
   double retval = _wcstod_l (ptr, nptr, endptr, __get_current_locale ());
@@ -245,7 +245,7 @@ wcstod_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
 
 double
 _DEFUN (wcstod, (nptr, endptr),
- _CONST wchar_t *__restrict nptr _AND wchar_t **__restrict endptr)
+ _CONST wchar_t *__restrict nptr, wchar_t **__restrict endptr)
 {
   return _wcstod_l (_REENT, nptr, endptr, __get_current_locale ());
 }
@@ -267,7 +267,7 @@ wcstof_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
 
 float
 _DEFUN (wcstof, (nptr, endptr),
- _CONST wchar_t *__restrict nptr _AND
+ _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 417a46d63..1f5fd4b3a 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -214,9 +214,9 @@ _wcstol_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 
 long
 _DEFUN (_wcstol_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST wchar_t *nptr _AND
- wchar_t **endptr _AND
+ struct _reent *rptr,
+ _CONST wchar_t *nptr,
+ wchar_t **endptr,
  int base)
 {
  return _wcstol_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -233,8 +233,8 @@ wcstol_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 
 long
 _DEFUN (wcstol, (s, ptr, base),
- _CONST wchar_t *__restrict s _AND
- wchar_t **__restrict ptr _AND
+ _CONST wchar_t *__restrict s,
+ wchar_t **__restrict ptr,
  int base)
 {
  return _wcstol_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index 3a7a0e28d..be9500027 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -214,9 +214,9 @@ _wcstoll_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 
 long long
 _DEFUN (_wcstoll_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST wchar_t *nptr _AND
- wchar_t **endptr _AND
+ struct _reent *rptr,
+ _CONST wchar_t *nptr,
+ wchar_t **endptr,
  int base)
 {
  return _wcstoll_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -233,8 +233,8 @@ 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 _AND
- wchar_t **__restrict ptr _AND
+ _CONST wchar_t *__restrict s,
+ wchar_t **__restrict ptr,
  int base)
 {
  return _wcstoll_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c
index 9e1937887..6df2dac55 100644
--- a/newlib/libc/stdlib/wcstombs.c
+++ b/newlib/libc/stdlib/wcstombs.c
@@ -49,8 +49,8 @@ effects vary with the locale.
 
 size_t
 _DEFUN (wcstombs, (s, pwcs, n),
-        char          *__restrict s    _AND
-        const wchar_t *__restrict pwcs _AND
+        char          *__restrict s,
+        const wchar_t *__restrict pwcs,
         size_t         n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c
index 0680cd783..d965dc228 100644
--- a/newlib/libc/stdlib/wcstombs_r.c
+++ b/newlib/libc/stdlib/wcstombs_r.c
@@ -4,10 +4,10 @@
 
 size_t
 _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
-        struct _reent *r    _AND        
-        char          *__restrict s    _AND
-        const wchar_t *__restrict pwcs _AND
-        size_t         n    _AND
+        struct _reent *r,
+        char          *__restrict s,
+        const wchar_t *__restrict pwcs,
+        size_t         n,
         mbstate_t     *state)
 {
   char *ptr = s;
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index d649810ea..2470bfa71 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -193,9 +193,9 @@ _wcstoul_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 
 unsigned long
 _DEFUN (_wcstoul_r, (rptr, nptr, endptr, base),
- struct _reent *rptr _AND
- _CONST wchar_t *nptr _AND
- wchar_t **endptr _AND
+ struct _reent *rptr,
+ _CONST wchar_t *nptr,
+ wchar_t **endptr,
  int base)
 {
  return _wcstoul_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -212,8 +212,8 @@ 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 _AND
- wchar_t **__restrict ptr _AND
+ _CONST wchar_t *__restrict s,
+ wchar_t **__restrict ptr,
  int base)
 {
  return _wcstoul_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 4bb0cd781..55ab3cae6 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -209,9 +209,9 @@ _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 _AND
- _CONST wchar_t *nptr _AND
- wchar_t **endptr _AND
+ struct _reent *rptr,
+ _CONST wchar_t *nptr,
+ wchar_t **endptr,
  int base)
 {
  return _wcstoull_l (rptr, nptr, endptr, base, __get_current_locale ());
@@ -228,8 +228,8 @@ 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 _AND
- wchar_t **__restrict ptr _AND
+ _CONST wchar_t *__restrict s,
+ wchar_t **__restrict ptr,
  int base)
 {
  return _wcstoull_l (_REENT, s, ptr, base, __get_current_locale ());
diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c
index 8b267a324..b68a43ba7 100644
--- a/newlib/libc/stdlib/wctomb.c
+++ b/newlib/libc/stdlib/wctomb.c
@@ -47,7 +47,7 @@ effects vary with the locale.
 
 int
 _DEFUN (wctomb, (s, wchar),
-        char *s _AND
+        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 2c018f916..7c4fac1e4 100644
--- a/newlib/libc/stdlib/wctomb_r.c
+++ b/newlib/libc/stdlib/wctomb_r.c
@@ -8,9 +8,9 @@
 
 int
 _DEFUN (_wctomb_r, (r, s, wchar, state),
-        struct _reent *r     _AND
-        char          *s     _AND
-        wchar_t        _wchar _AND
+        struct _reent *r,
+        char          *s,
+        wchar_t        _wchar,
         mbstate_t     *state)
 {
   return __WCTOMB (r, s, _wchar, state);
@@ -18,9 +18,9 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
 
 int
 _DEFUN (__ascii_wctomb, (r, s, wchar, state),
-        struct _reent *r       _AND
-        char          *s       _AND
-        wchar_t        _wchar  _AND
+        struct _reent *r,
+        char          *s,
+        wchar_t        _wchar,
         mbstate_t     *state)
 {
   /* Avoids compiler warnings about comparisons that are always false
@@ -51,9 +51,9 @@ _DEFUN (__ascii_wctomb, (r, s, wchar, state),
 
 int
 _DEFUN (__utf8_wctomb, (r, s, wchar, state),
-        struct _reent *r       _AND
-        char          *s       _AND
-        wchar_t        _wchar  _AND
+        struct _reent *r,
+        char          *s,
+        wchar_t        _wchar,
         mbstate_t     *state)
 {
   wint_t wchar = _wchar;
@@ -145,9 +145,9 @@ _DEFUN (__utf8_wctomb, (r, s, wchar, state),
 #ifndef __CYGWIN__
 int
 _DEFUN (__sjis_wctomb, (r, s, wchar, state),
-        struct _reent *r       _AND
-        char          *s       _AND
-        wchar_t        _wchar  _AND
+        struct _reent *r,
+        char          *s,
+        wchar_t        _wchar,
         mbstate_t     *state)
 {
   wint_t wchar = _wchar;
@@ -179,9 +179,9 @@ _DEFUN (__sjis_wctomb, (r, s, wchar, state),
 
 int
 _DEFUN (__eucjp_wctomb, (r, s, wchar, state),
-        struct _reent *r       _AND
-        char          *s       _AND
-        wchar_t        _wchar  _AND
+        struct _reent *r,
+        char          *s,
+        wchar_t        _wchar,
         mbstate_t     *state)
 {
   wint_t wchar = _wchar;
@@ -219,9 +219,9 @@ _DEFUN (__eucjp_wctomb, (r, s, wchar, state),
 
 int
 _DEFUN (__jis_wctomb, (r, s, wchar, state),
-        struct _reent *r       _AND
-        char          *s       _AND
-        wchar_t        _wchar  _AND
+        struct _reent *r,
+        char          *s,
+        wchar_t        _wchar,
         mbstate_t     *state)
 {
   wint_t wchar = _wchar;
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 86aada10c..342237742 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -33,8 +33,8 @@ QUICKREF
 
 int
 _DEFUN (bcmp, (m1, m2, n),
- _CONST void *m1 _AND
- _CONST void *m2 _AND
+ _CONST void *m1,
+ _CONST void *m2,
  size_t n)
 
 {
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 22a7f1bfe..1ad8b3e41 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -25,8 +25,8 @@ QUICKREF
 
 void
 _DEFUN (bcopy, (b1, b2, length),
- _CONST void *b1 _AND
- void *b2 _AND
+ _CONST void *b1,
+ void *b2,
  size_t length)
 {
   memmove (b2, b1, length);
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 2c4b49016..756bbff3e 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -32,7 +32,7 @@ QUICKREF
 
 char *
 _DEFUN (index, (s, c),
- _CONST char *s _AND
+ _CONST char *s,
  int c)
 {
   return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 219aa5cfe..6e49a1c6d 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -57,9 +57,9 @@ PORTABILITY
 
 _PTR
 _DEFUN (memccpy, (dst0, src0, endchar, len0),
- _PTR __restrict dst0 _AND
- _CONST _PTR __restrict src0 _AND
- int endchar0 _AND
+ _PTR __restrict dst0,
+ _CONST _PTR __restrict src0,
+ int endchar0,
  size_t len0)
 {
 
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 152cd718a..a6c5556d7 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -63,8 +63,8 @@ QUICKREF
 
 _PTR
 _DEFUN (memchr, (src_void, c, length),
- _CONST _PTR src_void _AND
- int c _AND
+ _CONST _PTR src_void,
+ int c,
  size_t length)
 {
   _CONST unsigned char *src = (_CONST unsigned char *) src_void;
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 8f86e7afd..1af9219de 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -44,8 +44,8 @@ QUICKREF
 
 int
 _DEFUN (memcmp, (m1, m2, n),
- _CONST _PTR m1 _AND
- _CONST _PTR m2 _AND
+ _CONST _PTR m1,
+ _CONST _PTR m2,
  size_t n)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index c76ab484f..3d0dca209 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -45,8 +45,8 @@ QUICKREF
 
 _PTR
 _DEFUN (memcpy, (dst0, src0, len0),
- _PTR __restrict dst0 _AND
- _CONST _PTR __restrict src0 _AND
+ _PTR __restrict dst0,
+ _CONST _PTR __restrict src0,
  size_t len0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c
index 59e19d245..5588b9f59 100644
--- a/newlib/libc/string/memmem.c
+++ b/newlib/libc/string/memmem.c
@@ -47,9 +47,9 @@ QUICKREF
 
 void *
 _DEFUN (memmem, (haystack_start, haystack_len, needle_start, needle_len),
- const void *haystack_start _AND
- size_t haystack_len _AND
- const void *needle_start _AND
+ const void *haystack_start,
+ size_t haystack_len,
+ const void *needle_start,
  size_t needle_len)
 {
   /* Abstract memory is considered to be an array of 'unsigned char' values,
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index e6275a7e1..10a3dfd2b 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -51,8 +51,8 @@ QUICKREF
 _PTR
 __inhibit_loop_to_libcall
 _DEFUN (memmove, (dst_void, src_void, length),
- _PTR dst_void _AND
- _CONST _PTR src_void _AND
+ _PTR dst_void,
+ _CONST _PTR src_void,
  size_t length)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 1a8e7cd34..74c453b47 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -44,8 +44,8 @@ PORTABILITY
 
 _PTR
 _DEFUN (mempcpy, (dst0, src0, len0),
- _PTR dst0 _AND
- _CONST _PTR src0 _AND
+ _PTR dst0,
+ _CONST _PTR src0,
  size_t len0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 974cebc16..6a2c03e4e 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -63,8 +63,8 @@ QUICKREF
 
 _PTR
 _DEFUN (memrchr, (src_void, c, length),
- _CONST _PTR src_void _AND
- int c _AND
+ _CONST _PTR src_void,
+ int c,
  size_t length)
 {
   _CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1;
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index 7d05478eb..284c36e2c 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -36,8 +36,8 @@ QUICKREF
 _PTR
 __inhibit_loop_to_libcall
 _DEFUN (memset, (m, c, n),
- _PTR m _AND
- int c _AND
+ _PTR m,
+ int c,
  size_t n)
 {
   char *s = (char *) m;
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index c1b360dd3..51fe8e37e 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -62,7 +62,7 @@ QUICKREF
 
 _PTR
 _DEFUN (rawmemchr, (src_void, c),
- _CONST _PTR src_void _AND
+ _CONST _PTR 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 3284361f8..e18fcb667 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -32,7 +32,7 @@ QUICKREF
 
 char *
 _DEFUN (rindex, (s, c),
- _CONST char *s _AND
+ _CONST char *s,
  int c)
 {
   return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 6272f1da6..5e00b24a2 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -54,7 +54,7 @@ QUICKREF
 
 char*
 _DEFUN (stpcpy, (dst, src),
- char *__restrict dst _AND
+ 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 aa5acd45f..9e8a12950 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -62,8 +62,8 @@ QUICKREF
 
 char *
 _DEFUN (stpncpy, (dst, src),
- char *__restrict dst _AND
- _CONST char *__restrict src _AND
+ char *__restrict dst,
+ _CONST char *__restrict src,
  size_t count)
 {
   char *ret = NULL;
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index a6c34862f..1ee8f0ebf 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -37,7 +37,7 @@ QUICKREF
 
 int
 _DEFUN (strcasecmp, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
  _CONST char *s2)
 {
   int d = 0;
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 599f50227..71ade6664 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -91,7 +91,7 @@ QUICKREF
  */
 char *
 _DEFUN (strcasestr, (s, find),
- _CONST char *s _AND
+ _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 44b6b03f0..96de39ba2 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -55,7 +55,7 @@ QUICKREF
 
 char *
 _DEFUN (strcat, (s1, s2),
- char *__restrict s1 _AND
+ 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 7147bd457..f293612d5 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -53,7 +53,7 @@ QUICKREF
 
 char *
 _DEFUN (strchr, (s1, i),
- _CONST char *s1 _AND
+ _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 3b6cd62fb..3d110b920 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -32,7 +32,7 @@ QUICKREF
 
 char *
 _DEFUN (strchrnul, (s1, i),
- _CONST char *s1 _AND
+ _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 d5e9148ef..c117c38ff 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -53,7 +53,7 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
- _CONST char *s1 _AND
+ _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 551ede65b..d95a42e2b 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -37,7 +37,7 @@ QUICKREF
 
 int
 _DEFUN (strcoll, (a, b),
- _CONST char *a _AND
+ _CONST char *a,
  _CONST char *b)
 
 {
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 9670d2c13..4354472d3 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -53,7 +53,7 @@ QUICKREF
 
 char*
 _DEFUN (strcpy, (dst0, src0),
- char *dst0 _AND
+ 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 f80b61f37..f0e30c80c 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -27,7 +27,7 @@ PORTABILITY
 
 size_t
 _DEFUN (strcspn, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
  _CONST char *s2)
 {
   _CONST char *s = s1;
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index ef77a58eb..474ec9668 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -4,7 +4,7 @@
 
 char *
 _DEFUN (_strdup_r, (reent_ptr, str),
-        struct _reent *reent_ptr  _AND
+        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 8da7d5185..43fa1f592 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -386,9 +386,9 @@ QUICKREF
 
 char *
 _DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
- struct _reent *ptr _AND
- int errnum _AND
- int internal _AND
+ struct _reent *ptr,
+ int errnum,
+ int internal,
  int *errptr)
 {
   char *error;
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index af9337563..c888f9ff3 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -66,8 +66,8 @@ a non-empty alternate string without assigning into its third argument.
    see xpg_strerror_r.c for the POSIX version.  */
 char *
 _DEFUN (strerror_r, (errnum, buffer, n),
- int errnum _AND
- char *buffer _AND
+ int errnum,
+ char *buffer,
  size_t n)
 {
   char *error = _strerror_r (_REENT, errnum, 1, NULL);
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index 0c47bd527..c606f3b30 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -43,8 +43,8 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
  */
 size_t
 _DEFUN (strlcat, (dst, src, siz),
- char *dst _AND
- _CONST char *src _AND
+ char *dst,
+ _CONST char *src,
  size_t siz)
 {
         register char *d = dst;
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index c31001642..300ac82c1 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -41,8 +41,8 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
  */
 size_t
 _DEFUN (strlcpy, (dst, src, siz),
- char *dst _AND
- _CONST char *src _AND
+ char *dst,
+ _CONST char *src,
  size_t siz)
 {
         register char *d = dst;
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index c06294232..a30fccf81 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -38,8 +38,8 @@ QUICKREF
 
 int
 _DEFUN (strncasecmp, (s1, s2, n),
- _CONST char *s1 _AND
- _CONST char *s2 _AND
+ _CONST char *s1,
+ _CONST char *s2,
  size_t n)
 {
   int d = 0;
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 761cf87a7..f800221c6 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -59,8 +59,8 @@ QUICKREF
 
 char *
 _DEFUN (strncat, (s1, s2, n),
- char *__restrict s1 _AND
- _CONST char *__restrict s2 _AND
+ char *__restrict s1,
+ _CONST char *__restrict s2,
  size_t n)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 3bbe47bcc..98a31d32b 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -53,8 +53,8 @@ QUICKREF
 
 int
 _DEFUN (strncmp, (s1, s2, n),
- _CONST char *s1 _AND
- _CONST char *s2 _AND
+ _CONST char *s1,
+ _CONST char *s2,
  size_t n)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index 83596f408..91b274590 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -60,8 +60,8 @@ QUICKREF
 
 char *
 _DEFUN (strncpy, (dst0, src0),
- char *__restrict dst0 _AND
- _CONST char *__restrict src0 _AND
+ char *__restrict dst0,
+ _CONST char *__restrict src0,
  size_t count)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index caa1b68b7..64e9ae68e 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -7,7 +7,7 @@
 
 char *
 _DEFUN (strndup, (str, n),
- _CONST char *str _AND
+ _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 2acf63dec..c8ec072fa 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -4,8 +4,8 @@
 
 char *
 _DEFUN (_strndup_r, (reent_ptr, str, n),
-        struct _reent *reent_ptr  _AND
-        _CONST char   *str _AND
+        struct _reent *reent_ptr,
+        _CONST char   *str,
         size_t n)
 {
   _CONST char *ptr = str;
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 07ece0d8b..4978f726d 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -31,7 +31,7 @@ PORTABILITY
 
 size_t
 _DEFUN (strnlen, (str, n),
- _CONST char *str _AND
+ _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 4507a86a4..f589fbdac 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -26,7 +26,7 @@ PORTABILITY
 
 char *
 _DEFUN (strpbrk, (s1, s2),
- _CONST char *s1 _AND
+ _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 8217c6df3..721bb91dc 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -31,7 +31,7 @@ QUICKREF
 
 char *
 _DEFUN (strrchr, (s, i),
- _CONST char *s _AND
+ _CONST char *s,
  int i)
 {
   _CONST char *last = NULL;
diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c
index d3d0ad0a9..e59782795 100644
--- a/newlib/libc/string/strsep.c
+++ b/newlib/libc/string/strsep.c
@@ -12,7 +12,7 @@ extern char *__strtok_r (char *, const char *, char **, int);
 
 char *
 _DEFUN (strsep, (source_ptr, delim),
- register char **source_ptr _AND
+ register char **source_ptr,
  register const char *delim)
 {
  return __strtok_r (*source_ptr, delim, source_ptr, 0);
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 3f43b8f82..287da4d7e 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -31,7 +31,7 @@ QUICKREF
 
 size_t
 _DEFUN (strspn, (s1, s2),
- _CONST char *s1 _AND
+ _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 288c74466..94fe297e7 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -40,7 +40,7 @@ QUICKREF
 
 char *
 _DEFUN (strstr, (searchee, lookfor),
- _CONST char *searchee _AND
+ _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 a24c538e4..92c801731 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -80,7 +80,7 @@ extern char *__strtok_r (char *, const char *, char **, int);
 
 char *
 _DEFUN (strtok, (s, delim),
- register char *__restrict s _AND
+ 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 6ace7008b..0d01dcaad 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -31,9 +31,9 @@
 
 char *
 _DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
- register char *s _AND
- register const char *delim _AND
- char **lasts _AND
+ register char *s,
+ register const char *delim,
+ char **lasts,
  int skip_leading_delim)
 {
  register char *spanp;
@@ -91,8 +91,8 @@ cont:
 
 char *
 _DEFUN (strtok_r, (s, delim, lasts),
- register char *__restrict s _AND
- register const char *__restrict delim _AND
+ register char *__restrict s,
+ register const char *__restrict delim,
  char **__restrict lasts)
 {
  return __strtok_r (s, delim, lasts, 1);
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index de397210b..55b81b335 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -47,8 +47,8 @@ QUICKREF
 
 size_t
 _DEFUN (strxfrm, (s1, s2, n),
- char *__restrict s1 _AND
- _CONST char *__restrict s2 _AND
+ char *__restrict s1,
+ _CONST char *__restrict s2,
  size_t n)
 {
   size_t res;
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index ecf5abed9..b08066875 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -19,8 +19,8 @@ PORTABILITY
 
 void
 _DEFUN (swab, (b1, b2, length),
- _CONST void *b1 _AND
- void *b2 _AND
+ _CONST void *b1,
+ void *b2,
  ssize_t length)
 {
   const char *from = b1;
diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c
index 2978df0cf..d3204df72 100644
--- a/newlib/libc/string/u_strerr.c
+++ b/newlib/libc/string/u_strerr.c
@@ -2,8 +2,8 @@
 
 char *
 _DEFUN(_user_strerror, (errnum, internal, errptr),
-       int errnum _AND
-       int internal _AND
+       int errnum,
+       int internal,
        int *errptr)
 {
   /* prevent warning about unused parameters */
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index f0f9c4a08..0fda226e7 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -27,7 +27,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcpcpy, (s1, s2),
- wchar_t *__restrict s1 _AND
+ 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 8f7ee796f..f643b1e43 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -34,8 +34,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcpncpy, (dst, src, count),
- wchar_t *__restrict dst _AND
- _CONST wchar_t *__restrict src _AND
+ wchar_t *__restrict dst,
+ _CONST wchar_t *__restrict src,
  size_t count)
 {
   wchar_t *ret = NULL;
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index 26c7cc237..f23e37227 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -37,7 +37,7 @@ QUICKREF
 
 int
 _DEFUN (wcscasecmp, (s1, s2),
- _CONST wchar_t *s1 _AND
+ _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 586512d0f..900c3cc52 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -62,7 +62,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcscat, (s1, s2),
- wchar_t *__restrict s1 _AND
+ 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 c705a08d5..7590009e9 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -59,7 +59,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcschr, (s, c),
- _CONST wchar_t * s _AND
+ _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 8155742b8..f14eb5d8d 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -68,7 +68,7 @@ No supporting OS subroutines are required.
  */
 int
 _DEFUN (wcscmp, (s1, s2),
- _CONST wchar_t * s1 _AND
+ _CONST wchar_t * s1,
  _CONST wchar_t * s2)
 {
 
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 020f7e57f..27a12456e 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -34,7 +34,7 @@ PORTABILITY
 
 int
 _DEFUN (wcscoll, (a, b),
- _CONST wchar_t *a _AND
+ _CONST wchar_t *a,
  _CONST wchar_t *b)
 
 {
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 79f065ca0..2dff63996 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -58,7 +58,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcscpy, (s1, s2),
- wchar_t *__restrict s1 _AND
+ 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 7be5f5eee..355499699 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -57,7 +57,7 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcscspn, (s, set),
- _CONST wchar_t * s _AND
+ _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 2caa58820..1015c4c36 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -69,8 +69,8 @@ No supporting OS subroutines are required.
  */
 size_t
 _DEFUN (wcslcat, (dst, src, siz),
- wchar_t * dst _AND
- _CONST wchar_t * src _AND
+ wchar_t * dst,
+ _CONST wchar_t * src,
  size_t siz)
 {
   wchar_t *d = dst;
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 34352fb9d..396dda71a 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
  */
 size_t
 _DEFUN (wcslcpy, (dst, src, siz),
- wchar_t * dst _AND
- _CONST wchar_t * src _AND
+ wchar_t * dst,
+ _CONST wchar_t * src,
  size_t siz)
 {
   wchar_t *d = dst;
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index a339bbfa5..90f310158 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -38,8 +38,8 @@ QUICKREF
 
 int
 _DEFUN (wcsncasecmp, (s1, s2, n),
- _CONST wchar_t *s1 _AND
- _CONST wchar_t *s2 _AND
+ _CONST wchar_t *s1,
+ _CONST wchar_t *s2,
  size_t n)
 {
   int d = 0;
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 34a694790..57dc9031b 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcsncat, (s1, s2, n),
- wchar_t *__restrict s1 _AND
- _CONST wchar_t *__restrict s2 _AND
+ wchar_t *__restrict s1,
+ _CONST wchar_t *__restrict s2,
  size_t n)
 {
   wchar_t *p;
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 72c5d1291..83b899d84 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -64,8 +64,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN (wcsncmp, (s1, s2, n),
- _CONST wchar_t * s1 _AND
- _CONST wchar_t * s2 _AND
+ _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 793e522da..d09b95df7 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -36,8 +36,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcsncpy, (s1, s2, n),
- wchar_t *__restrict s1 _AND
- _CONST wchar_t *__restrict s2 _AND
+ wchar_t *__restrict s1,
+ _CONST wchar_t *__restrict s2,
  size_t n)
 {
   wchar_t *dscan=s1;
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index 77aad65a3..e9715e749 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -53,7 +53,7 @@ PORTABILITY
 
 size_t
 _DEFUN(wcsnlen, (s, maxlen),
-                 _CONST wchar_t *s _AND
+                 _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 55401f1a9..b4d8230cc 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -58,7 +58,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcspbrk, (s, set),
- _CONST wchar_t * s _AND
+ _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 b99cb9760..68f1e28b6 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -61,7 +61,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcsrchr, (s, c),
- _CONST wchar_t * s _AND
+ _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 652d971dd..8e8ce6c69 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -57,7 +57,7 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcsspn, (s, set),
- _CONST wchar_t * s _AND
+ _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 bb6e3eda8..2fdec0f97 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -62,7 +62,7 @@ PORTABILITY
 
 wchar_t *
 _DEFUN (wcsstr, (big, little),
- _CONST wchar_t *__restrict big _AND
+ _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 091f4bd3e..2467704fd 100644
--- a/newlib/libc/string/wcstok.c
+++ b/newlib/libc/string/wcstok.c
@@ -91,8 +91,8 @@ QUICKREF
 
 wchar_t *
 _DEFUN (wcstok, (s, delim, lasts),
- register wchar_t *__restrict s _AND
- register const wchar_t *__restrict delim _AND
+ register wchar_t *__restrict s,
+ register const wchar_t *__restrict delim,
  wchar_t **__restrict lasts)
 {
  register const wchar_t *spanp;
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 4cb8fa812..3764883a9 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -35,7 +35,7 @@ PORTABILITY
 
 int
 _DEFUN (wcswidth, (pwcs, n),
- _CONST wchar_t *pwcs _AND
+ _CONST wchar_t *pwcs,
  size_t n)
 
 {
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index e11516ff4..6911b21e2 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -37,8 +37,8 @@ PORTABILITY
 
 size_t
 _DEFUN (wcsxfrm, (a, b, n),
- wchar_t *__restrict a _AND
- _CONST wchar_t *__restrict b _AND
+ wchar_t *__restrict a,
+ _CONST wchar_t *__restrict b,
  size_t n)
 
 {
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 097e47a03..2a6f8e1a4 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -64,8 +64,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wmemchr, (s, c, n),
- _CONST wchar_t * s _AND
- wchar_t c _AND
+ _CONST wchar_t * s,
+ wchar_t c,
  size_t n)
 {
   size_t i;
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index a01bf32f1..bfe1e69b4 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN (wmemcmp, (s1, s2, n),
- _CONST wchar_t * s1 _AND
- _CONST wchar_t * s2 _AND
+ _CONST wchar_t * s1,
+ _CONST wchar_t * s2,
  size_t n)
 {
   size_t i;
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index 0e8d6e494..9e4fdc517 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -62,8 +62,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wmemcpy, (d, s, n),
- wchar_t *__restrict d _AND
- _CONST wchar_t *__restrict s _AND
+ 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 18d2a2bfd..567f55afd 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -67,8 +67,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wmemmove, (d, s, n),
- wchar_t * d _AND
- _CONST wchar_t * s _AND
+ 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 a3b2ce637..f11485262 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -35,8 +35,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wmempcpy, (d, s, n),
- wchar_t *__restrict d _AND
- _CONST wchar_t *__restrict s _AND
+ wchar_t *__restrict d,
+ _CONST wchar_t *__restrict s,
  size_t n)
 {
   return (wchar_t *) mempcpy (d, s, n * sizeof (wchar_t));
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index 377fbee1f..f9ec361cd 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -60,8 +60,8 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN(wmemset, (s, c, n),
- wchar_t *s _AND
- wchar_t c _AND
+ wchar_t *s,
+ wchar_t c,
  size_t n)
 {
  size_t i;
diff --git a/newlib/libc/string/xpg_strerror_r.c b/newlib/libc/string/xpg_strerror_r.c
index e503880b0..bc1858738 100644
--- a/newlib/libc/string/xpg_strerror_r.c
+++ b/newlib/libc/string/xpg_strerror_r.c
@@ -5,8 +5,8 @@
 
 int
 _DEFUN (__xpg_strerror_r, (errnum, buffer, n),
- int errnum _AND
- char *buffer _AND
+ int errnum,
+ char *buffer,
  size_t n)
 {
   char *error;
diff --git a/newlib/libc/sys/a29khif/kill.c b/newlib/libc/sys/a29khif/kill.c
index ff9fe5428..0254367e4 100644
--- a/newlib/libc/sys/a29khif/kill.c
+++ b/newlib/libc/sys/a29khif/kill.c
@@ -7,7 +7,7 @@
 
 int
 _DEFUN (_kill, (pid, sig),
- int pid _AND
+ 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 6021b5cb6..4869af2d3 100644
--- a/newlib/libc/sys/h8300hms/misc.c
+++ b/newlib/libc/sys/h8300hms/misc.c
@@ -19,7 +19,7 @@ int _DEFUN(_getpid,(),)
 }
 
 int _DEFUN(_kill,(pid, sig),
-   int pid _AND
+   int pid,
    int sig)
 {
   if (pid == 0)
diff --git a/newlib/libc/sys/h8500hms/misc.c b/newlib/libc/sys/h8500hms/misc.c
index a791704a1..d16c797d9 100644
--- a/newlib/libc/sys/h8500hms/misc.c
+++ b/newlib/libc/sys/h8500hms/misc.c
@@ -20,7 +20,7 @@ int _DEFUN(_getpid,(),)
 }
 
 int _DEFUN(_kill,(pid, sig),
-   int pid _AND
+   int pid,
    int sig)
 {
   if (sig == SIGABRT)
diff --git a/newlib/libc/sys/linux/pread.c b/newlib/libc/sys/linux/pread.c
index ff8371e15..8a016e08a 100644
--- a/newlib/libc/sys/linux/pread.c
+++ b/newlib/libc/sys/linux/pread.c
@@ -7,10 +7,10 @@
 
 ssize_t
 _DEFUN (_pread_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
+     struct _reent *rptr,
+     int fd,
+     _PTR buf,
+     size_t n,
      off_t off)
 {
   off_t cur_pos;
@@ -34,9 +34,9 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
 
 ssize_t
 _DEFUN (__libc_pread, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
+     int fd,
+     _PTR buf,
+     size_t n,
      off_t off)
 {
   return _pread_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/sys/linux/pread64.c b/newlib/libc/sys/linux/pread64.c
index 3ced04818..f95989b45 100644
--- a/newlib/libc/sys/linux/pread64.c
+++ b/newlib/libc/sys/linux/pread64.c
@@ -31,9 +31,9 @@ Supporting OS subroutine required: <<read>>, <<lseek64>>.
 
 ssize_t
 _DEFUN (__libc_pread64, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
+     int fd,
+     _PTR buf,
+     size_t n,
      loff_t off)
 {
   loff_t cur_pos;
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index 239463e59..c2b79ad13 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -7,10 +7,10 @@
 
 ssize_t
 _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
+     struct _reent *rptr,
+     int fd,
+     _CONST _PTR buf,
+     size_t n,
      off_t off)
 {
   off_t cur_pos;
@@ -34,9 +34,9 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
 
 ssize_t
 _DEFUN (__libc_pwrite, (fd, buf, n, off),
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
+     int fd,
+     _CONST _PTR buf,
+     size_t n,
      off_t off)
 {
   return _pwrite_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/sys/linux/pwrite64.c b/newlib/libc/sys/linux/pwrite64.c
index 876749943..d486988dd 100644
--- a/newlib/libc/sys/linux/pwrite64.c
+++ b/newlib/libc/sys/linux/pwrite64.c
@@ -31,9 +31,9 @@ Supporting OS subroutine required: <<write>>, <<lseek64>>.
 
 ssize_t
 _DEFUN (__libc_pwrite64, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
+     int fd,
+     _PTR buf,
+     size_t n,
      loff_t off)
 {
   loff_t cur_pos;
diff --git a/newlib/libc/sys/sysnec810/misc.c b/newlib/libc/sys/sysnec810/misc.c
index f44c03d51..354ecd81c 100644
--- a/newlib/libc/sys/sysnec810/misc.c
+++ b/newlib/libc/sys/sysnec810/misc.c
@@ -31,7 +31,7 @@ isatty() {
 
 int
 _DEFUN(_fstat,(file, st),
-       int file _AND
+       int file,
        struct stat *st)
 {
   st->st_mode = S_IFCHR;
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index 154c082f9..3471e893f 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -5,8 +5,8 @@
 
 int
 _DEFUN (execve, (name, argv, env),
-     _CONST char *name _AND
-     char *_CONST argv[] _AND
+     _CONST char *name,
+     char *_CONST argv[],
      char *_CONST env[])
 {
   return _execve_r (_REENT, name, argv, env);
diff --git a/newlib/libc/syscalls/sysfcntl.c b/newlib/libc/syscalls/sysfcntl.c
index 12d09a8af..b063d766f 100644
--- a/newlib/libc/syscalls/sysfcntl.c
+++ b/newlib/libc/syscalls/sysfcntl.c
@@ -6,8 +6,8 @@
 
 int
 _DEFUN (fcntl, (fd, flag, arg),
-     int fd _AND
-     int flag _AND
+     int fd,
+     int flag,
      int arg)
 {
 #ifdef HAVE_FCNTL
diff --git a/newlib/libc/syscalls/sysfstat.c b/newlib/libc/syscalls/sysfstat.c
index 7ce2c9dfe..1ab7d62fa 100644
--- a/newlib/libc/syscalls/sysfstat.c
+++ b/newlib/libc/syscalls/sysfstat.c
@@ -6,7 +6,7 @@
 
 int
 _DEFUN (fstat, (fd, pstat),
-     int fd _AND
+     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 af6d8ab3f..f52f0045f 100644
--- a/newlib/libc/syscalls/sysgettod.c
+++ b/newlib/libc/syscalls/sysgettod.c
@@ -6,7 +6,7 @@
 
 int
 _DEFUN (gettimeofday, (ptimeval, ptimezone),
-     struct timeval *ptimeval _AND
+     struct timeval *ptimeval,
      void *ptimezone)
 {
   return _gettimeofday_r (_REENT, ptimeval, ptimezone);
diff --git a/newlib/libc/syscalls/syskill.c b/newlib/libc/syscalls/syskill.c
index 27f16be97..03e06c07a 100644
--- a/newlib/libc/syscalls/syskill.c
+++ b/newlib/libc/syscalls/syskill.c
@@ -5,7 +5,7 @@
 
 int
 _DEFUN (kill, (pid, sig),
-     int pid _AND
+     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 327870769..afcf3559e 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -5,7 +5,7 @@
 
 int
 _DEFUN (link, (old, new),
-     _CONST char *old _AND
+     _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 275d67ce4..41cfbf745 100644
--- a/newlib/libc/syscalls/syslseek.c
+++ b/newlib/libc/syscalls/syslseek.c
@@ -5,8 +5,8 @@
 
 off_t
 _DEFUN (lseek, (fd, pos, whence),
-     int fd _AND
-     off_t pos _AND
+     int fd,
+     off_t pos,
      int whence)
 {
   return _lseek_r (_REENT, fd, pos, whence);
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index ed0cb604a..3909564cf 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -11,7 +11,7 @@
 
 int
 _DEFUN (open, (file, flags, ...),
-        const char *file _AND
+        const char *file,
         int flags _DOTS)
 {
   va_list ap;
diff --git a/newlib/libc/syscalls/sysread.c b/newlib/libc/syscalls/sysread.c
index bcf002d9d..e45b76336 100644
--- a/newlib/libc/syscalls/sysread.c
+++ b/newlib/libc/syscalls/sysread.c
@@ -5,8 +5,8 @@
 
 _READ_WRITE_RETURN_TYPE
 _DEFUN (read, (fd, buf, cnt),
-     int fd _AND
-     void *buf _AND
+     int fd,
+     void *buf,
      size_t cnt)
 {
   return _read_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index fdf029cef..4f4cd8a78 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -6,7 +6,7 @@
 
 int
 _DEFUN (stat, (file, pstat),
-     _CONST char *file _AND
+     _CONST char *file,
      struct stat *pstat)
 {
   return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/syswrite.c b/newlib/libc/syscalls/syswrite.c
index 0f080fb4d..35a1e8430 100644
--- a/newlib/libc/syscalls/syswrite.c
+++ b/newlib/libc/syscalls/syswrite.c
@@ -5,8 +5,8 @@
 
 _READ_WRITE_RETURN_TYPE
 _DEFUN (write, (fd, buf, cnt),
-     int fd _AND
-     const void *buf _AND
+     int fd,
+     const void *buf,
      size_t cnt)
 {
   return _write_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index 2ec53698e..c38e32f41 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -7,7 +7,7 @@
 
 char *
 _DEFUN (asctime_r, (tim_p, result),
- _CONST struct tm *__restrict tim_p _AND
+ _CONST struct tm *__restrict tim_p,
  char *__restrict result)
 {
   static _CONST char day_name[7][3] = {
diff --git a/newlib/libc/time/ctime_r.c b/newlib/libc/time/ctime_r.c
index fda8cac1e..3546142dd 100644
--- a/newlib/libc/time/ctime_r.c
+++ b/newlib/libc/time/ctime_r.c
@@ -6,7 +6,7 @@
 
 char *
 _DEFUN (ctime_r, (tim_p, result),
- _CONST time_t * tim_p _AND
+ _CONST time_t * tim_p,
         char * result)
 
 {
diff --git a/newlib/libc/time/difftime.c b/newlib/libc/time/difftime.c
index 893fa4700..363eb6482 100644
--- a/newlib/libc/time/difftime.c
+++ b/newlib/libc/time/difftime.c
@@ -31,7 +31,7 @@ in all implementations.
 
 double
 _DEFUN (difftime, (tim1, tim2),
- time_t tim1 _AND
+ time_t tim1,
  time_t tim2)
 {
   return (double)(tim1 - tim2);
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index 6475df3ba..01f95ebf7 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -47,7 +47,7 @@
 
 struct tm *
 _DEFUN (gmtime_r, (tim_p, res),
- _CONST time_t *__restrict tim_p _AND
+ _CONST time_t *__restrict tim_p,
  struct tm *__restrict res)
 {
   long days, rem;
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index 3342e9906..9abf683a7 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -17,7 +17,7 @@
 
 struct tm *
 _DEFUN (localtime_r, (tim_p, res),
- _CONST time_t *__restrict tim_p _AND
+ _CONST time_t *__restrict tim_p,
  struct tm *__restrict res)
 {
   long offset;
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index cf426d673..54df9b2e1 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -1432,9 +1432,9 @@ recurse:
 
 size_t
 _DEFUN (strftime, (s, maxsize, format, tim_p),
- CHAR *__restrict s _AND
- size_t maxsize _AND
- _CONST CHAR *__restrict format _AND
+ CHAR *__restrict s,
+ size_t maxsize,
+ _CONST CHAR *__restrict format,
  _CONST struct tm *__restrict tim_p)
 {
 #ifdef _WANT_C99_TIME_FORMATS
diff --git a/newlib/libc/unix/pread.c b/newlib/libc/unix/pread.c
index 7d351d9d1..236044465 100644
--- a/newlib/libc/unix/pread.c
+++ b/newlib/libc/unix/pread.c
@@ -39,10 +39,10 @@ Supporting OS subroutine required: <<read>>, <<lseek>>.
 
 ssize_t
 _DEFUN (_pread_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
+     struct _reent *rptr,
+     int fd,
+     _PTR buf,
+     size_t n,
      off_t off)
 {
   off_t cur_pos;
@@ -66,9 +66,9 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
 
 ssize_t
 _DEFUN (pread, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
+     int fd,
+     _PTR buf,
+     size_t n,
      off_t off)
 {
   return _pread_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index dad841243..2256a30ca 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -40,10 +40,10 @@ Supporting OS subroutine required: <<write>>, <<lseek>>.
 
 ssize_t
 _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
+     struct _reent *rptr,
+     int fd,
+     _CONST _PTR buf,
+     size_t n,
      off_t off)
 {
   off_t cur_pos;
@@ -67,9 +67,9 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
 
 ssize_t
 _DEFUN (pwrite, (fd, buf, n, off),
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
+     int fd,
+     _CONST _PTR buf,
+     size_t n,
      off_t off)
 {
   return _pwrite_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/unix/ttyname_r.c b/newlib/libc/unix/ttyname_r.c
index 32bbd67af..673e7f543 100644
--- a/newlib/libc/unix/ttyname_r.c
+++ b/newlib/libc/unix/ttyname_r.c
@@ -45,8 +45,8 @@
  */
 int
 _DEFUN( ttyname_r,(fd, name, namesize),
- int fd _AND
- char   *name _AND
+ int fd,
+ char   *name,
  size_t  namesize)
 {
   struct stat sb;
diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index 646f9dbe0..8c637fcbf 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -63,7 +63,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
  */
 void
 _DEFUN (xdr_free, (proc, objp),
-        xdrproc_t proc _AND
+        xdrproc_t proc,
  void * objp)
 {
   XDR x;
@@ -87,7 +87,7 @@ _DEFUN_VOID (xdr_void)
  */
 bool_t
 _DEFUN (xdr_int, (xdrs, ip),
-        XDR * xdrs _AND
+        XDR * xdrs,
  int * ip)
 {
 #if INT_MAX < LONG_MAX
@@ -122,7 +122,7 @@ _DEFUN (xdr_int, (xdrs, ip),
  */
 bool_t
 _DEFUN (xdr_u_int, (xdrs, up),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int * up)
 {
 #if UINT_MAX < ULONG_MAX
@@ -157,7 +157,7 @@ _DEFUN (xdr_u_int, (xdrs, up),
  */
 bool_t
 _DEFUN (xdr_long, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  long * lp)
 {
   if ((xdrs->x_op == XDR_ENCODE)
@@ -178,7 +178,7 @@ _DEFUN (xdr_long, (xdrs, lp),
  */
 bool_t
 _DEFUN (xdr_u_long, (xdrs, ulp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_long * ulp)
 {
   switch (xdrs->x_op)
@@ -209,7 +209,7 @@ _DEFUN (xdr_u_long, (xdrs, ulp),
  */
 bool_t
 _DEFUN (xdr_int32_t, (xdrs, int32_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  int32_t * int32_p)
 {
   switch (xdrs->x_op)
@@ -231,7 +231,7 @@ _DEFUN (xdr_int32_t, (xdrs, int32_p),
  */
 bool_t
 _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int32_t * u_int32_p)
 {
   switch (xdrs->x_op)
@@ -253,7 +253,7 @@ _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
  */
 bool_t
 _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  uint32_t * uint32_p)
 {
   switch (xdrs->x_op)
@@ -275,7 +275,7 @@ _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
  */
 bool_t
 _DEFUN (xdr_short, (xdrs, sp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  short * sp)
 {
   long l;
@@ -303,7 +303,7 @@ _DEFUN (xdr_short, (xdrs, sp),
  */
 bool_t
 _DEFUN (xdr_u_short, (xdrs, usp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_short * usp)
 {
   long l;
@@ -332,7 +332,7 @@ _DEFUN (xdr_u_short, (xdrs, usp),
  */
 bool_t
 _DEFUN (xdr_int16_t, (xdrs, int16_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  int16_t * int16_p)
 {
   int32_t t;
@@ -360,7 +360,7 @@ _DEFUN (xdr_int16_t, (xdrs, int16_p),
  */
 bool_t
 _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int16_t * u_int16_p)
 {
   uint32_t ut;
@@ -388,7 +388,7 @@ _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
  */
 bool_t
 _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  uint16_t * uint16_p)
 {
   uint32_t ut;
@@ -416,7 +416,7 @@ _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
  */
 bool_t
 _DEFUN (xdr_int8_t, (xdrs, int8_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  int8_t * int8_p)
 {
   int32_t t;
@@ -444,7 +444,7 @@ _DEFUN (xdr_int8_t, (xdrs, int8_p),
  */
 bool_t
 _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int8_t * u_int8_p)
 {
   uint32_t ut;
@@ -472,7 +472,7 @@ _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
  */
 bool_t
 _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
-        XDR * xdrs _AND
+        XDR * xdrs,
  uint8_t * uint8_p)
 {
   uint32_t ut;
@@ -502,7 +502,7 @@ _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
  */
 bool_t
 _DEFUN (xdr_char, (xdrs, cp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  char * cp)
 {
   int i;
@@ -519,7 +519,7 @@ _DEFUN (xdr_char, (xdrs, cp),
  */
 bool_t
 _DEFUN (xdr_u_char, (xdrs, ucp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_char * ucp)
 {
   u_int u;
@@ -536,7 +536,7 @@ _DEFUN (xdr_u_char, (xdrs, ucp),
  */
 bool_t
 _DEFUN (xdr_bool, (xdrs, bp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  bool_t * bp)
 {
   long lb;
@@ -564,7 +564,7 @@ _DEFUN (xdr_bool, (xdrs, bp),
  */
 bool_t
 _DEFUN (xdr_enum, (xdrs, ep),
-        XDR * xdrs _AND
+        XDR * xdrs,
  enum_t * ep)
 {
   enum sizecheck
@@ -608,8 +608,8 @@ _DEFUN (xdr_enum, (xdrs, ep),
  */
 bool_t
 _DEFUN (xdr_opaque, (xdrs, cp, cnt),
-        XDR * xdrs _AND
- caddr_t cp _AND
+        XDR * xdrs,
+ caddr_t cp,
  u_int cnt)
 {
   u_int rndup;
@@ -657,9 +657,9 @@ _DEFUN (xdr_opaque, (xdrs, cp, cnt),
  */
 bool_t
 _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
-        XDR * xdrs _AND
- char ** cpp _AND
- u_int * sizep _AND
+        XDR * xdrs,
+ char ** cpp,
+ u_int * sizep,
  u_int maxsize)
 {
   char *sp = *cpp;              /* sp is the actual string pointer */
@@ -712,7 +712,7 @@ _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
  */
 bool_t
 _DEFUN (xdr_netobj, (xdrs, np),
-        XDR * xdrs _AND
+        XDR * xdrs,
  struct netobj * np)
 {
   return (xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -735,10 +735,10 @@ _DEFUN (xdr_netobj, (xdrs, np),
  */
 bool_t
 _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
-        XDR * xdrs _AND
-        enum_t * dscmp _AND
-        char * unp _AND
-        const struct xdr_discrim * choices _AND
+        XDR * xdrs,
+        enum_t * dscmp,
+        char * unp,
+        const struct xdr_discrim * choices,
         xdrproc_t dfault)
 {
   enum_t dscm;
@@ -784,8 +784,8 @@ _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
  */
 bool_t
 _DEFUN (xdr_string, (xdrs, cpp, maxsize),
-        XDR * xdrs _AND
-        char ** cpp _AND
+        XDR * xdrs,
+        char ** cpp,
         u_int maxsize)
 {
   char *sp = *cpp;              /* sp is the actual string pointer */
@@ -862,7 +862,7 @@ _DEFUN (xdr_string, (xdrs, cpp, maxsize),
  */
 bool_t
 _DEFUN (xdr_wrapstring, (xdrs, cpp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         char ** cpp)
 {
   return xdr_string (xdrs, cpp, LASTUNSIGNED);
@@ -883,7 +883,7 @@ _DEFUN (xdr_wrapstring, (xdrs, cpp),
  */
 bool_t
 _DEFUN (xdr_int64_t, (xdrs, llp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         int64_t * llp)
 {
   int32_t t1, t2;
@@ -914,7 +914,7 @@ _DEFUN (xdr_int64_t, (xdrs, llp),
  */
 bool_t
 _DEFUN (xdr_u_int64_t, (xdrs, ullp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         u_int64_t * ullp)
 {
   uint32_t t1, t2;
@@ -946,7 +946,7 @@ _DEFUN (xdr_u_int64_t, (xdrs, ullp),
  */
 bool_t
 _DEFUN (xdr_uint64_t, (xdrs, ullp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         uint64_t * ullp)
 {
   uint32_t t1, t2;
@@ -979,7 +979,7 @@ _DEFUN (xdr_uint64_t, (xdrs, ullp),
  */
 bool_t
 _DEFUN (xdr_hyper, (xdrs, llp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         quad_t * llp)
 {
   /*
@@ -995,7 +995,7 @@ _DEFUN (xdr_hyper, (xdrs, llp),
  */
 bool_t
 _DEFUN (xdr_u_hyper, (xdrs, ullp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         u_quad_t * ullp)
 {
   /*
@@ -1011,7 +1011,7 @@ _DEFUN (xdr_u_hyper, (xdrs, ullp),
  */
 bool_t
 _DEFUN (xdr_longlong_t, (xdrs, llp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         quad_t * llp)
 {
   /*
@@ -1027,7 +1027,7 @@ _DEFUN (xdr_longlong_t, (xdrs, llp),
  */
 bool_t
 _DEFUN (xdr_u_longlong_t, (xdrs, ullp),
-        XDR * xdrs _AND
+        XDR * xdrs,
         u_quad_t *ullp)
 {
   /*
diff --git a/newlib/libc/xdr/xdr_array.c b/newlib/libc/xdr/xdr_array.c
index 98549acbb..9c9748725 100644
--- a/newlib/libc/xdr/xdr_array.c
+++ b/newlib/libc/xdr/xdr_array.c
@@ -55,11 +55,11 @@
  */
 bool_t
 _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
-        XDR * xdrs _AND
- caddr_t * addrp _AND
- u_int * sizep _AND
- u_int maxsize _AND
-        u_int elsize _AND
+        XDR * xdrs,
+ caddr_t * addrp,
+ u_int * sizep,
+ u_int maxsize,
+        u_int elsize,
  xdrproc_t elproc)
 {
   u_int i;
@@ -139,10 +139,10 @@ _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
  */
 bool_t
 _DEFUN (xdr_vector, (xdrs, basep, nelem, elemsize, xdr_elem),
-        XDR * xdrs _AND
- char *basep _AND
- u_int nelem _AND
- u_int elemsize _AND
+        XDR * xdrs,
+ char *basep,
+ u_int nelem,
+ u_int elemsize,
         xdrproc_t xdr_elem)
 {
   u_int i;
diff --git a/newlib/libc/xdr/xdr_float.c b/newlib/libc/xdr/xdr_float.c
index 00726bb43..691e92965 100644
--- a/newlib/libc/xdr/xdr_float.c
+++ b/newlib/libc/xdr/xdr_float.c
@@ -60,7 +60,7 @@
 
 bool_t
 _DEFUN (xdr_float, (xdrs, fp),
-       XDR * xdrs _AND
+       XDR * xdrs,
        float *fp)
 {
   switch (xdrs->x_op)
@@ -81,7 +81,7 @@ _DEFUN (xdr_float, (xdrs, fp),
 #if !defined(_DOUBLE_IS_32BITS)
 bool_t
 _DEFUN (xdr_double, (xdrs, dp),
-        XDR * xdrs _AND
+        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 323e43ed8..ed943480f 100644
--- a/newlib/libc/xdr/xdr_float_vax.c
+++ b/newlib/libc/xdr/xdr_float_vax.c
@@ -82,7 +82,7 @@ static struct sgl_limits
 
 bool_t
 _DEFUN (xdr_float, (xdrs, fp),
-       XDR * xdrs _AND
+       XDR * xdrs,
        float *fp)
 {
   struct ieee_single is;
@@ -185,7 +185,7 @@ static struct dbl_limits
 
 bool_t
 _DEFUN (xdr_double, (xdrs, dp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  double *dp)
 {
   int32_t *lp;
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 497342d5e..b49dc3b8f 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -102,9 +102,9 @@ static _CONST struct xdr_ops xdrmem_ops_unaligned = {
  */
 void
 _DEFUN (xdrmem_create, (xdrs, addr, size, op),
-        XDR * xdrs _AND
- caddr_t addr _AND
- u_int size _AND
+        XDR * xdrs,
+ caddr_t addr,
+ u_int size,
  enum xdr_op op)
 {
   xdrs->x_op = op;
@@ -123,7 +123,7 @@ _DEFUN (xdrmem_destroy, (xdrs),
 
 static bool_t
 _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
@@ -136,7 +136,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  _CONST long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
@@ -149,7 +149,7 @@ _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  long *lp)
 {
   u_int32_t l;
@@ -165,7 +165,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  _CONST long *lp)
 {
   u_int32_t l;
@@ -181,8 +181,8 @@ _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
-        XDR * xdrs _AND
- char *addr _AND
+        XDR * xdrs,
+ char *addr,
  u_int len)
 {
   if (xdrs->x_handy < len)
@@ -195,8 +195,8 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
 
 static bool_t
 _DEFUN (xdrmem_putbytes, (xdrs, addr, len),
-        XDR * xdrs _AND
- _CONST char *addr _AND
+        XDR * xdrs,
+ _CONST char *addr,
  u_int len)
 {
   if (xdrs->x_handy < len)
@@ -217,7 +217,7 @@ _DEFUN (xdrmem_getpos, (xdrs),
 
 static bool_t
 _DEFUN (xdrmem_setpos, (xdrs, pos),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int pos)
 {
   caddr_t newaddr = xdrs->x_base + pos;
@@ -237,7 +237,7 @@ _DEFUN (xdrmem_setpos, (xdrs, pos),
 
 static int32_t *
 _DEFUN (xdrmem_inline_aligned, (xdrs, len),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int len)
 {
   int32_t *buf = 0;
@@ -253,7 +253,7 @@ _DEFUN (xdrmem_inline_aligned, (xdrs, len),
 
 static int32_t *
 _DEFUN (xdrmem_inline_unaligned, (xdrs, len),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int len)
 {
   return (0);
@@ -261,7 +261,7 @@ _DEFUN (xdrmem_inline_unaligned, (xdrs, len),
 
 static bool_t
 _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
  int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
@@ -274,7 +274,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
 
 static bool_t
 _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
-        XDR *xdrs _AND
+        XDR *xdrs,
  _CONST int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
@@ -287,7 +287,7 @@ _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
 
 static bool_t
 _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
  int32_t *ip)
 {
   u_int32_t l;
@@ -303,7 +303,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
 
 static bool_t
 _DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
-        XDR *xdrs _AND
+        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 16b37a249..ea557fa03 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -36,7 +36,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
 
 void
 _DEFUN (xdr_vwarnx, (format, ap),
-        _CONST char *format _AND
+        _CONST char *format,
  va_list ap)
 {
   if (xdr_vprintf)
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index eef4c4871..0caadd6d5 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -170,11 +170,11 @@ bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
  */
 void
 _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
-        XDR * xdrs _AND
- u_int sendsize _AND
- u_int recvsize _AND
- void *tcp_handle _AND
-        int _EXPARM (readit, (void *, void *, int)) _AND
+        XDR * xdrs,
+ u_int sendsize,
+ u_int recvsize,
+ void *tcp_handle,
+        int _EXPARM (readit, (void *, void *, int)),
         int _EXPARM (writeit, (void *, void *, int)))
 {
   RECSTREAM *rstrm;
@@ -262,7 +262,7 @@ _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
 
 static bool_t
 _DEFUN (xdrrec_getlong, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -289,7 +289,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrrec_putlong, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  _CONST long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -314,8 +314,8 @@ _DEFUN (xdrrec_putlong, (xdrs, lp),
 
 static bool_t                   /* must manage buffers, fragments, and records */
 _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
-        XDR * xdrs _AND
- char *addr _AND
+        XDR * xdrs,
+ char *addr,
  u_int len)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -344,8 +344,8 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
 
 static bool_t
 _DEFUN (xdrrec_putbytes, (xdrs, addr, len),
-        XDR * xdrs _AND
-        _CONST char *addr _AND
+        XDR * xdrs,
+        _CONST char *addr,
  u_int len)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -399,7 +399,7 @@ _DEFUN (xdrrec_getpos, (xdrs),
 
 static bool_t
 _DEFUN (xdrrec_setpos, (xdrs, pos),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int pos)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -440,7 +440,7 @@ _DEFUN (xdrrec_setpos, (xdrs, pos),
 
 static int32_t *
 _DEFUN (xdrrec_inline, (xdrs, len),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int len)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -494,7 +494,7 @@ _DEFUN (xdrrec_destroy, (xdrs),
 
 static bool_t
 _DEFUN (xdrrec_getint32, (xdrs, ip),
-        XDR *xdrs _AND
+        XDR *xdrs,
  int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -521,7 +521,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
 
 static bool_t
 _DEFUN (xdrrec_putint32, (xdrs, ip),
-        XDR *xdrs _AND
+        XDR *xdrs,
  _CONST int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -618,7 +618,7 @@ _DEFUN (xdrrec_eof, (xdrs),
  */
 bool_t
 _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
-        XDR * xdrs _AND
+        XDR * xdrs,
  bool_t sendnow)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -645,8 +645,8 @@ _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
  */
 bool_t
 _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
-        XDR * xdrs _AND
- enum xprt_stat * statp _AND
+        XDR * xdrs,
+ enum xprt_stat * statp,
  bool_t expectdata)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -738,7 +738,7 @@ _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
 
 bool_t
 _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
-        XDR * xdrs _AND
+        XDR * xdrs,
  int maxrec)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -755,7 +755,7 @@ _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
  */
 static bool_t
 _DEFUN (flush_out, (rstrm, eor),
-        RECSTREAM * rstrm _AND
+        RECSTREAM * rstrm,
  bool_t eor)
 {
   u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
@@ -799,8 +799,8 @@ _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 _AND
- char *addr _AND
+        RECSTREAM * rstrm,
+ char *addr,
  size_t len)
 {
   size_t current;
@@ -861,7 +861,7 @@ _DEFUN (set_input_fragment, (rstrm),
 
 static bool_t                   /* consumes input bytes; knows nothing about records! */
 _DEFUN (skip_input_bytes, (rstrm, cnt),
-        RECSTREAM * rstrm _AND
+        RECSTREAM * rstrm,
  long cnt)
 {
   size_t current;
@@ -898,7 +898,7 @@ _DEFUN (fix_buf_size, (s),
  */
 static bool_t
 _DEFUN (realloc_stream, (rstrm, size),
-        RECSTREAM * rstrm _AND
+        RECSTREAM * rstrm,
  int size)
 {
   ptrdiff_t diff;
diff --git a/newlib/libc/xdr/xdr_reference.c b/newlib/libc/xdr/xdr_reference.c
index 010a7e719..7a5f1d851 100644
--- a/newlib/libc/xdr/xdr_reference.c
+++ b/newlib/libc/xdr/xdr_reference.c
@@ -57,9 +57,9 @@
  */
 bool_t
 _DEFUN (xdr_reference, (xdrs, pp, size, proc),
-        XDR * xdrs _AND
- caddr_t * pp _AND
- u_int size _AND
+        XDR * xdrs,
+ caddr_t * pp,
+ u_int size,
  xdrproc_t proc)
 {
   caddr_t loc = *pp;
@@ -118,9 +118,9 @@ _DEFUN (xdr_reference, (xdrs, pp, size, proc),
  */
 bool_t
 _DEFUN (xdr_pointer, (xdrs, objpp, obj_size, xdr_obj),
-        XDR * xdrs _AND
- char **objpp _AND
- u_int obj_size _AND
+        XDR * xdrs,
+ char **objpp,
+ u_int obj_size,
  xdrproc_t xdr_obj)
 {
   bool_t more_data;
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 156a2e17b..34d1e6036 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -44,7 +44,7 @@
 /* ARGSUSED */
 static bool_t
 _DEFUN (x_putlong, (xdrs, longp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  _CONST long *longp)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -54,8 +54,8 @@ _DEFUN (x_putlong, (xdrs, longp),
 /* ARGSUSED */
 static bool_t
 _DEFUN (x_putbytes, (xdrs, bp, len),
-        XDR * xdrs _AND
- const char *bp _AND
+        XDR * xdrs,
+ const char *bp,
  u_int len)
 {
   xdrs->x_handy += len;
@@ -72,7 +72,7 @@ _DEFUN (x_getpostn, (xdrs),
 /* ARGSUSED */
 static bool_t
 _DEFUN (x_setpostn, (xdrs, pos),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int pos)
 {
   /* This is not allowed */
@@ -81,7 +81,7 @@ _DEFUN (x_setpostn, (xdrs, pos),
 
 static int32_t *
 _DEFUN (x_inline, (xdrs, len),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int len)
 {
   if (len == 0)
@@ -133,7 +133,7 @@ _DEFUN (x_destroy, (xdrs),
 
 static bool_t
 _DEFUN (x_putint32, (xdrs, int32p),
-        XDR *xdrs _AND
+        XDR *xdrs,
  _CONST int32_t *int32p)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -143,7 +143,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
 
 unsigned long
 _DEFUN (xdr_sizeof, (func, data),
-        xdrproc_t func _AND
+        xdrproc_t func,
  _PTR data)
 {
   XDR x;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index c933c68cd..5bb4b13f1 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -84,8 +84,8 @@ static _CONST struct xdr_ops xdrstdio_ops = {
  */
 void
 _DEFUN (xdrstdio_create, (xdrs, file, op),
-        XDR * xdrs _AND
- FILE * file _AND
+        XDR * xdrs,
+ FILE * file,
  enum xdr_op op)
 {
   xdrs->x_op = op;
@@ -109,7 +109,7 @@ _DEFUN (xdrstdio_destroy, (xdrs),
 
 static bool_t
 _DEFUN (xdrstdio_getlong, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  long *lp)
 {
   u_int32_t temp;
@@ -122,7 +122,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrstdio_putlong, (xdrs, lp),
-        XDR * xdrs _AND
+        XDR * xdrs,
  _CONST long *lp)
 {
   u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -134,8 +134,8 @@ _DEFUN (xdrstdio_putlong, (xdrs, lp),
 
 static bool_t
 _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
-        XDR * xdrs _AND
-        char *addr _AND
+        XDR * xdrs,
+        char *addr,
  u_int len)
 {
   if ((len != 0) && (fread (addr, (size_t) len, 1,
@@ -146,8 +146,8 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
 
 static bool_t
 _DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
-        XDR * xdrs _AND
-        _CONST char *addr _AND
+        XDR * xdrs,
+        _CONST char *addr,
  u_int len)
 {
   if ((len != 0) && (fwrite (addr, (size_t) len, 1,
@@ -165,7 +165,7 @@ _DEFUN (xdrstdio_getpos, (xdrs),
 
 static bool_t
 _DEFUN (xdrstdio_setpos, (xdrs, pos),
-        XDR * xdrs _AND
+        XDR * xdrs,
         u_int pos)
 {
   return ((fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0) ?
@@ -175,7 +175,7 @@ _DEFUN (xdrstdio_setpos, (xdrs, pos),
 /* ARGSUSED */
 static int32_t *
 _DEFUN (xdrstdio_inline, (xdrs, len),
-        XDR * xdrs _AND
+        XDR * xdrs,
  u_int len)
 {
   /*
@@ -192,7 +192,7 @@ _DEFUN (xdrstdio_inline, (xdrs, len),
 
 static bool_t
 _DEFUN (xdrstdio_getint32, (xdrs, ip),
-        XDR *xdrs _AND
+        XDR *xdrs,
  int32_t *ip)
 {
   int32_t temp;
@@ -205,7 +205,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
 
 static bool_t
 _DEFUN (xdrstdio_putint32, (xdrs, ip),
-        XDR *xdrs _AND
+        XDR *xdrs,
  _CONST int32_t *ip)
 {
   int32_t temp = htonl (*ip);
diff --git a/newlib/libm/mathfp/s_asine.c b/newlib/libm/mathfp/s_asine.c
index 3212862b8..28cfaf7a6 100644
--- a/newlib/libm/mathfp/s_asine.c
+++ b/newlib/libm/mathfp/s_asine.c
@@ -90,7 +90,7 @@ static const double b[] = { 1.57079632679489661923, 0.78539816339744830962 };
 
 double
 _DEFUN (asine, (double, int),
-        double x _AND
+        double x,
         int acosine)
 {
   int flag, i;
diff --git a/newlib/libm/mathfp/s_atan2.c b/newlib/libm/mathfp/s_atan2.c
index 00121db4b..9f71ed9c8 100644
--- a/newlib/libm/mathfp/s_atan2.c
+++ b/newlib/libm/mathfp/s_atan2.c
@@ -70,7 +70,7 @@ PORTABILITY
 
 double
 _DEFUN (atan2, (double, double),
-        double v _AND
+        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 cd9db2dcd..1df39ac50 100644
--- a/newlib/libm/mathfp/s_atangent.c
+++ b/newlib/libm/mathfp/s_atangent.c
@@ -86,9 +86,9 @@ static const double p[] = { -0.13688768894191926929e+2,
 
 double
 _DEFUN (atangent, (double, double, double, int),
-        double x _AND
-        double v _AND
-        double u _AND
+        double x,
+        double v,
+        double u,
         int arctan2)
 {
   double f, g, R, P, Q, A, res;
diff --git a/newlib/libm/mathfp/s_ldexp.c b/newlib/libm/mathfp/s_ldexp.c
index 6971af697..472093071 100644
--- a/newlib/libm/mathfp/s_ldexp.c
+++ b/newlib/libm/mathfp/s_ldexp.c
@@ -64,7 +64,7 @@ PORTABILITY
 
 double
 _DEFUN (ldexp, (double, int),
-        double d _AND
+        double d,
         int e)
 {
   int exp;
diff --git a/newlib/libm/mathfp/s_logarithm.c b/newlib/libm/mathfp/s_logarithm.c
index 977a6406d..d14bf2eb4 100644
--- a/newlib/libm/mathfp/s_logarithm.c
+++ b/newlib/libm/mathfp/s_logarithm.c
@@ -80,7 +80,7 @@ static const double C3 =  0.43429448190325182765;
 
 double
 _DEFUN (logarithm, (double, int),
-        double x _AND
+        double x,
         int ten)
 {
   int N;
diff --git a/newlib/libm/mathfp/s_sincos.c b/newlib/libm/mathfp/s_sincos.c
index e313e6f1d..8fc65ac20 100644
--- a/newlib/libm/mathfp/s_sincos.c
+++ b/newlib/libm/mathfp/s_sincos.c
@@ -21,8 +21,8 @@
 
 void
 _DEFUN (sincos, (x, sinx, cosx),
-        double x _AND
-        double *sinx _AND
+        double x,
+        double *sinx,
         double *cosx)
 {
   *sinx = sin (x);
diff --git a/newlib/libm/mathfp/s_sine.c b/newlib/libm/mathfp/s_sine.c
index f8bf52952..d5e4469a0 100644
--- a/newlib/libm/mathfp/s_sine.c
+++ b/newlib/libm/mathfp/s_sine.c
@@ -73,7 +73,7 @@ static const double r[] = { -0.16666666666666665052,
 
 double
 _DEFUN (sine, (double, int),
-        double x _AND
+        double x,
         int cosine)
 {
   int sgn, N;
diff --git a/newlib/libm/mathfp/s_sineh.c b/newlib/libm/mathfp/s_sineh.c
index 581484ac1..457003ff8 100644
--- a/newlib/libm/mathfp/s_sineh.c
+++ b/newlib/libm/mathfp/s_sineh.c
@@ -95,7 +95,7 @@ static const double V_OVER2_MINUS1 = 0.13830277879601902638e-4;
 
 double
 _DEFUN (sineh, (double, int),
-        double x _AND
+        double x,
         int cosineh)
 {
   double y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/mathfp/sf_asine.c b/newlib/libm/mathfp/sf_asine.c
index 12ba28927..a74778034 100644
--- a/newlib/libm/mathfp/sf_asine.c
+++ b/newlib/libm/mathfp/sf_asine.c
@@ -31,7 +31,7 @@ static const float b[] = { 1.570796326, 0.785398163 };
 
 float
 _DEFUN (asinef, (float, int),
-        float x _AND
+        float x,
         int acosine)
 {
   int flag, i;
diff --git a/newlib/libm/mathfp/sf_atan2.c b/newlib/libm/mathfp/sf_atan2.c
index 69c612354..e866ecbb8 100644
--- a/newlib/libm/mathfp/sf_atan2.c
+++ b/newlib/libm/mathfp/sf_atan2.c
@@ -19,7 +19,7 @@
 
 float
 _DEFUN (atan2f, (float, float),
-        float v _AND
+        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 7a8f0cebe..1865cde74 100644
--- a/newlib/libm/mathfp/sf_atangent.c
+++ b/newlib/libm/mathfp/sf_atangent.c
@@ -32,9 +32,9 @@ static const float p[] = { -0.4708325141, -0.5090958253e-1 };
 
 float
 _DEFUN (atangentf, (float, float, float, int),
-        float x _AND
-        float v _AND
-        float u _AND
+        float x,
+        float v,
+        float u,
         int arctan2)
 {
   float f, g, R, P, Q, A, res;
diff --git a/newlib/libm/mathfp/sf_fmod.c b/newlib/libm/mathfp/sf_fmod.c
index 0ac86bbef..611725409 100644
--- a/newlib/libm/mathfp/sf_fmod.c
+++ b/newlib/libm/mathfp/sf_fmod.c
@@ -26,7 +26,7 @@ static const float one = 1.0, Zero[] = {0.0, -0.0,};
 
 float
 _DEFUN (fmodf, (float, float),
-        float x _AND
+        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 6b6c2c00b..3a0d7a41a 100644
--- a/newlib/libm/mathfp/sf_ldexp.c
+++ b/newlib/libm/mathfp/sf_ldexp.c
@@ -24,7 +24,7 @@
 
 float
 _DEFUN (ldexpf, (float, int),
-        float d _AND
+        float d,
         int e)
 {
   int exp;
diff --git a/newlib/libm/mathfp/sf_logarithm.c b/newlib/libm/mathfp/sf_logarithm.c
index c22ba862a..855ee0744 100644
--- a/newlib/libm/mathfp/sf_logarithm.c
+++ b/newlib/libm/mathfp/sf_logarithm.c
@@ -32,7 +32,7 @@ static const float C3 = 0.4342944819;
 
 float
 _DEFUN (logarithmf, (float, int),
-        float x _AND
+        float x,
         int ten)
 {
   int N;
diff --git a/newlib/libm/mathfp/sf_sincos.c b/newlib/libm/mathfp/sf_sincos.c
index e192b4b44..85b393dce 100644
--- a/newlib/libm/mathfp/sf_sincos.c
+++ b/newlib/libm/mathfp/sf_sincos.c
@@ -19,8 +19,8 @@
 
 void
 _DEFUN (sincosf, (x, sinx, cosx),
-        float x _AND
-        float *sinx _AND
+        float x,
+        float *sinx,
         float *cosx)
 {
   *sinx = sin (x);
diff --git a/newlib/libm/mathfp/sf_sine.c b/newlib/libm/mathfp/sf_sine.c
index 6932de26c..24725bde1 100644
--- a/newlib/libm/mathfp/sf_sine.c
+++ b/newlib/libm/mathfp/sf_sine.c
@@ -33,7 +33,7 @@ static const float r[] = { -0.1666665668,
 
 float
 _DEFUN (sinef, (float, int),
-        float x _AND
+        float x,
         int cosine)
 {
   int sgn, N;
diff --git a/newlib/libm/mathfp/sf_sineh.c b/newlib/libm/mathfp/sf_sineh.c
index 4eee2c927..966e91362 100644
--- a/newlib/libm/mathfp/sf_sineh.c
+++ b/newlib/libm/mathfp/sf_sineh.c
@@ -33,7 +33,7 @@ static const float V_OVER2_MINUS1 = 0.1383027787e-4;
 
 float
 _DEFUN (sinehf, (float, int),
-        float x _AND
+        float x,
         int cosineh)
 {
   float y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index a74828027..8420cdec7 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -50,7 +50,7 @@ _DEFUN_VOID(test_atoff)
 static
 void
 _DEFUN(iterate,(func, name),
-       void _EXFUN((*func),(void)) _AND
+       void _EXFUN((*func),(void)),
        char *name)
 {
 
@@ -71,7 +71,7 @@ int_type *p = ints;
 
 static void
 _DEFUN(int_iterate,(func, name),
-       void (*func)() _AND
+       void (*func)(),
        char *name)
 {
   newfunc(name);
@@ -87,8 +87,8 @@ _DEFUN(int_iterate,(func, name),
 
 void
 _DEFUN(test_strtol_base,(base, pi, string),
-       int base _AND
-       int_scan_type *pi _AND
+       int base,
+       int_scan_type *pi,
        char *string)
 {
   long r;
@@ -207,7 +207,7 @@ _DEFUN_VOID(test_fcvt)
 static void
 
 _DEFUN(diterate,(func, name),
-       void (*func)() _AND
+       void (*func)(),
        char *name)
 {
   newfunc(name);
diff --git a/newlib/libm/test/dcvt.c b/newlib/libm/test/dcvt.c
index 2aaa1af28..922652e9f 100644
--- a/newlib/libm/test/dcvt.c
+++ b/newlib/libm/test/dcvt.c
@@ -40,8 +40,8 @@ double *value)
 
 static char *
 _DEFUN(print_nan,(buffer, value, precision),
-       char *buffer _AND
-       double value _AND
+       char *buffer,
+       double value,
        int precision)
 {
   size_t  i;
@@ -134,7 +134,7 @@ _DEFUN(renormalize,(in),
 
 static void
 _DEFUN(normalize,(value, in),
-       double value _AND
+       double value,
        cvt_info_type *in)
 {
   int j;
@@ -196,9 +196,9 @@ _DEFUN(normalize,(value, in),
 }
 int
 _DEFUN(round,(in, start, now, ch),
-       cvt_info_type *in _AND
-       char *start _AND
-       char *now _AND
+       cvt_info_type *in,
+       char *start,
+       char *now,
        char ch)
 {
   double rounder = 5.0;
@@ -435,11 +435,11 @@ _DEFUN(_cvtf,(in),
 
 char *
 _DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
-       char *buffer _AND
-       double invalue _AND
-       int precision _AND
-       int width _AND
-       char type _AND
+       char *buffer,
+       double invalue,
+       int precision,
+       int width,
+       char type,
        int dot)
 {
   cvt_info_type in;
@@ -534,10 +534,10 @@ _DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
 
 char *
 _DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
-       double invalue _AND
-       int ndigit _AND
-       int *decpt _AND
-       int *sign _AND
+       double invalue,
+       int ndigit,
+       int *decpt,
+       int *sign,
        char *fcvt_buf)
 {
   cvt_info_type in;
@@ -564,10 +564,10 @@ _DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
 
 char *
 _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
-       double invalue _AND
-       int ndigit _AND
-       int *decpt _AND
-       int *sign _AND
+       double invalue,
+       int ndigit,
+       int *decpt,
+       int *sign,
        char *fcvt_buf)
 {
   cvt_info_type in;
@@ -597,8 +597,8 @@ _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
 
 char *
 _DEFUN(gcvt,(d,ndigit,buf),
-   double d _AND
-   int ndigit _AND
+   double d,
+   int ndigit,
    char *buf)
 {
   return _dcvt(buf, d, ndigit, 0, 'g', 1);
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index df63c2df2..50b22223a 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -51,7 +51,7 @@ _DEFUN(matherr,(e),
 
 
 void _DEFUN(translate_to,(file,r),
-    FILE *file _AND
+    FILE *file,
     double r)
 {
   __ieee_double_shape_type bits;
@@ -61,10 +61,10 @@ void _DEFUN(translate_to,(file,r),
 
 int
 _DEFUN(ffcheck,( is, p, name, serrno, merror),
-       double is _AND
-       one_line_type *p _AND
-       char *name _AND
-       int serrno _AND
+       double is,
+       one_line_type *p,
+       char *name,
+       int serrno,
        int merror)
 {
   /* Make sure the answer isn't to far wrong from the correct value */
@@ -109,7 +109,7 @@ _DEFUN(ffcheck,( is, p, name, serrno, merror),
 
 double
 _DEFUN(thedouble, (msw, lsw),
-       long msw _AND
+       long msw,
        long lsw)
 {
   __ieee_double_shape_type x;
@@ -124,13 +124,13 @@ int reduce;
 
 
 _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
-       FILE *f _AND
-       int mag _AND
-       one_line_type *p _AND
-       double result _AND
-       int merror _AND
-       int errno _AND
-       char *args _AND
+       FILE *f,
+       int mag,
+       one_line_type *p,
+       double result,
+       int merror,
+       int errno,
+       char *args,
        char *name)
 {
   if (reduce && p->error_bit < mag)
@@ -177,11 +177,11 @@ _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
 }
 
 _DEFUN(finish,(f, vector,  result , p, args, name),
-       FILE *f _AND
-       int vector _AND
-       double result _AND
-       one_line_type *p _AND
-       char *args _AND
+       FILE *f,
+       int vector,
+       double result,
+       one_line_type *p,
+       char *args,
        char *name)
 {
   int mag;
@@ -195,10 +195,10 @@ _DEFUN(finish,(f, vector,  result , p, args, name),
 int redo;  
 
 _DEFUN(run_vector_1,(vector, p, func, name, args),
-       int vector _AND
-       one_line_type *p _AND
-       char *func _AND
-       char *name _AND
+       int vector,
+       one_line_type *p,
+       char *func,
+       char *name,
        char *args)
 {
   FILE *f;
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index c47047212..e97dfcc62 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -11,7 +11,7 @@ int  errors = 0;
 
 void
 _DEFUN(checkit,(ok,l),
-       int ok _AND
+       int ok,
        int l )
 
 {
@@ -32,8 +32,8 @@ _DEFUN(checkit,(ok,l),
 
 void
 _DEFUN(funcqual,(a,b,l),
-       char *a _AND
-       char *b _AND
+       char *a,
+       char *b,
        int l)
 {
   newfunc(it);
@@ -145,7 +145,7 @@ void test_string()
   equal(one, "abcd"); /* Zero count. */
 
   (void) strncat(one, "gh", 2);
-  equal(one, "abcdgh"); /* Count _AND length equal. */
+  equal(one, "abcdgh"); /* Count, length equal. */
   it = "strncmp";
   /* strncmp - first test as strcmp with big counts";*/
   check(strncmp("", "", 99) == 0); /* Trivial case. */
@@ -494,7 +494,7 @@ void test_string()
 
   (void) memset(one+5, 0, 1);
   equal(one, "axxxe"); /* Zero fill. */
-  equal(one+6, "gh"); /* _AND the leftover. */
+  equal(one+6, "gh"); /*, the leftover. */
 
   (void) memset(one+2, 010045, 1);
   equal(one, "ax\045xe"); /* Unsigned char convert. */
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index 615c54aa5..b25e4b963 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -10,7 +10,7 @@ int inacc;
 
 int
 _DEFUN(main,(ac, av),
-       int ac _AND
+       int ac,
        char **av)
 {
   int i;
@@ -93,7 +93,7 @@ int strtod_vector = 0;
 
 int
 _DEFUN(bigger,(a,b),
-   __ieee_double_shape_type *a  _AND
+   __ieee_double_shape_type *a,
    __ieee_double_shape_type *b)
 {
 
@@ -117,7 +117,7 @@ _DEFUN(bigger,(a,b),
 /* Return the first bit different between two double numbers */
 int
 _DEFUN(mag_of_error,(is, shouldbe),
-       double is _AND
+       double is,
        double shouldbe)
 {
   __ieee_double_shape_type a,b;
@@ -184,7 +184,7 @@ _DEFUN(mag_of_error,(is, shouldbe),
 
 void
 _DEFUN(test_sok,(is, shouldbe),
-       char *is _AND
+       char *is,
        char *shouldbe)
 {
   if (strcmp(is,shouldbe))
@@ -198,7 +198,7 @@ _DEFUN(test_sok,(is, shouldbe),
 }
 void
 _DEFUN(test_iok,(is, shouldbe),
-       int is _AND
+       int is,
        int shouldbe)
 {
   if (is != shouldbe){
@@ -216,8 +216,8 @@ _DEFUN(test_iok,(is, shouldbe),
 */
 void
 _DEFUN(test_scok,(is, shouldbe, count),
-       char *is _AND
-       char *shouldbe _AND
+       char *is,
+       char *shouldbe,
        int count)
 {
   if (strncmp(is,shouldbe, count))
@@ -232,7 +232,7 @@ _DEFUN(test_scok,(is, shouldbe, count),
 
 void
 _DEFUN(test_eok,(is, shouldbe),
-       int is _AND
+       int is,
        int shouldbe)
 {
   if (is != shouldbe){
@@ -246,8 +246,8 @@ _DEFUN(test_eok,(is, shouldbe),
 
 void
 _DEFUN(test_mok,(value, shouldbe, okmag),
-       double value _AND
-       double shouldbe _AND
+       double value,
+       double shouldbe,
        int okmag)
 {
   __ieee_double_shape_type a,b;
diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c
index a126d01e6..07c49418d 100644
--- a/newlib/libm/test/test_ieee.c
+++ b/newlib/libm/test/test_ieee.c
@@ -83,7 +83,7 @@ _DEFUN_VOID(test_getroundtoi)
 
 double
  _DEFUN(dnumber,(msw, lsw),
- int msw _AND
+ int msw,
  int lsw)
 {
   
diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c
index 2e99becbf..39c15c10e 100644
--- a/newlib/libm/test/test_is.c
+++ b/newlib/libm/test/test_is.c
@@ -1934,8 +1934,8 @@ int _DEFUN(def__toupper,(i), int i) { return _toupper(i); }
 extern int inacc;
 void
 _DEFUN(test_is_set,(func, name, p),
-       int (*func)() _AND
-       char *name _AND
+       int (*func)(),
+       char *name,
        int *p)
 {
   int i;
@@ -1953,10 +1953,10 @@ _DEFUN(test_is_set,(func, name, p),
 }
 void
 _DEFUN(test_to_set,(func, name, p, low, high),
-       int (*func)() _AND
-       char *name _AND
-       int *p _AND
-       int low _AND
+       int (*func)(),
+       char *name,
+       int *p,
+       int low,
        int high)
 {
   int i;
--
2.15.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v2 02/17] ansification: remove _CONST

Yaakov Selkowitz-2
In reply to this post by Yaakov Selkowitz-2
Signed-off-by: Yaakov Selkowitz <[hidden email]>
---
 newlib/libc/ctype/ctype_.c                |   6 +-
 newlib/libc/ctype/ctype_.h                |   2 +-
 newlib/libc/ctype/ctype_cp.h              |   4 +-
 newlib/libc/ctype/ctype_iso.h             |   4 +-
 newlib/libc/iconv/ccs/big5.c              |  10 +--
 newlib/libc/iconv/ccs/ccs.h               |  10 +--
 newlib/libc/iconv/ccs/ccsbi.c             |   2 +-
 newlib/libc/iconv/ccs/ccsbi.h             |  82 +++++++++++------------
 newlib/libc/iconv/ccs/cns11643_plane1.c   |  10 +--
 newlib/libc/iconv/ccs/cns11643_plane14.c  |  10 +--
 newlib/libc/iconv/ccs/cns11643_plane2.c   |  10 +--
 newlib/libc/iconv/ccs/cp775.c             |   6 +-
 newlib/libc/iconv/ccs/cp850.c             |   6 +-
 newlib/libc/iconv/ccs/cp852.c             |   6 +-
 newlib/libc/iconv/ccs/cp855.c             |   6 +-
 newlib/libc/iconv/ccs/cp866.c             |   6 +-
 newlib/libc/iconv/ccs/iso_8859_1.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_10.c       |   6 +-
 newlib/libc/iconv/ccs/iso_8859_11.c       |   6 +-
 newlib/libc/iconv/ccs/iso_8859_13.c       |   6 +-
 newlib/libc/iconv/ccs/iso_8859_14.c       |   6 +-
 newlib/libc/iconv/ccs/iso_8859_15.c       |   6 +-
 newlib/libc/iconv/ccs/iso_8859_2.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_3.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_4.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_5.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_6.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_7.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_8.c        |   6 +-
 newlib/libc/iconv/ccs/iso_8859_9.c        |   6 +-
 newlib/libc/iconv/ccs/iso_ir_111.c        |   6 +-
 newlib/libc/iconv/ccs/jis_x0201_1976.c    |   6 +-
 newlib/libc/iconv/ccs/jis_x0208_1990.c    |  10 +--
 newlib/libc/iconv/ccs/jis_x0212_1990.c    |  10 +--
 newlib/libc/iconv/ccs/koi8_r.c            |   6 +-
 newlib/libc/iconv/ccs/koi8_ru.c           |   6 +-
 newlib/libc/iconv/ccs/koi8_u.c            |   6 +-
 newlib/libc/iconv/ccs/koi8_uni.c          |   6 +-
 newlib/libc/iconv/ccs/ksx1001.c           |  10 +--
 newlib/libc/iconv/ccs/mktbl.pl            |  14 ++--
 newlib/libc/iconv/ccs/win_1250.c          |   6 +-
 newlib/libc/iconv/ccs/win_1251.c          |   6 +-
 newlib/libc/iconv/ccs/win_1252.c          |   6 +-
 newlib/libc/iconv/ccs/win_1253.c          |   6 +-
 newlib/libc/iconv/ccs/win_1254.c          |   6 +-
 newlib/libc/iconv/ccs/win_1255.c          |   6 +-
 newlib/libc/iconv/ccs/win_1256.c          |   6 +-
 newlib/libc/iconv/ccs/win_1257.c          |   6 +-
 newlib/libc/iconv/ccs/win_1258.c          |   6 +-
 newlib/libc/iconv/ces/cesbi.c             |  68 +++++++++----------
 newlib/libc/iconv/ces/cesbi.h             |  40 +++++------
 newlib/libc/iconv/ces/euc.c               |  18 ++---
 newlib/libc/iconv/ces/mkdeps.pl           |  24 +++----
 newlib/libc/iconv/ces/table-pcs.c         |  10 +--
 newlib/libc/iconv/ces/table.c             |  56 ++++++++--------
 newlib/libc/iconv/ces/ucs-2-internal.c    |   6 +-
 newlib/libc/iconv/ces/ucs-2.c             |   8 +--
 newlib/libc/iconv/ces/ucs-4-internal.c    |   6 +-
 newlib/libc/iconv/ces/ucs-4.c             |   8 +--
 newlib/libc/iconv/ces/us-ascii.c          |   6 +-
 newlib/libc/iconv/ces/utf-16.c            |  10 +--
 newlib/libc/iconv/ces/utf-8.c             |   8 +--
 newlib/libc/iconv/lib/aliasesbi.c         |   2 +-
 newlib/libc/iconv/lib/aliasesi.c          |  30 ++++-----
 newlib/libc/iconv/lib/conv.h              |  18 ++---
 newlib/libc/iconv/lib/iconv.c             |  18 ++---
 newlib/libc/iconv/lib/iconvnls.c          |  32 ++++-----
 newlib/libc/iconv/lib/local.h             |   2 +-
 newlib/libc/iconv/lib/nullconv.c          |   8 +--
 newlib/libc/iconv/lib/ucsconv.c           |  24 +++----
 newlib/libc/iconv/lib/ucsconv.h           |  26 +++----
 newlib/libc/include/_ansi.h               |   2 -
 newlib/libc/include/ctype.h               |   2 +-
 newlib/libc/include/iconv.h               |   6 +-
 newlib/libc/include/pthread.h             |  54 +++++++--------
 newlib/libc/include/rpc/xdr.h             |  10 +--
 newlib/libc/include/stdio.h               |   4 +-
 newlib/libc/include/stdlib.h              |   4 +-
 newlib/libc/include/sys/errno.h           |   2 +-
 newlib/libc/include/sys/iconvnls.h        |  12 ++--
 newlib/libc/include/sys/reent.h           |   2 +-
 newlib/libc/include/unctrl.h              |   4 +-
 newlib/libc/locale/locale.c               |   4 +-
 newlib/libc/machine/cris/sys/errno.h      |   2 +-
 newlib/libc/machine/microblaze/strcmp.c   |   4 +-
 newlib/libc/machine/microblaze/strcpy.c   |   6 +-
 newlib/libc/machine/microblaze/strlen.c   |   6 +-
 newlib/libc/machine/powerpc/atosfix16.c   |   4 +-
 newlib/libc/machine/powerpc/atosfix32.c   |   4 +-
 newlib/libc/machine/powerpc/atosfix64.c   |   4 +-
 newlib/libc/machine/powerpc/atoufix16.c   |   4 +-
 newlib/libc/machine/powerpc/atoufix32.c   |   4 +-
 newlib/libc/machine/powerpc/atoufix64.c   |   4 +-
 newlib/libc/machine/powerpc/strtosfix16.c |   4 +-
 newlib/libc/machine/powerpc/strtosfix32.c |   4 +-
 newlib/libc/machine/powerpc/strtosfix64.c |   4 +-
 newlib/libc/machine/powerpc/strtoufix16.c |   4 +-
 newlib/libc/machine/powerpc/strtoufix32.c |   4 +-
 newlib/libc/machine/powerpc/strtoufix64.c |   4 +-
 newlib/libc/machine/powerpc/vfprintf.c    |   8 +--
 newlib/libc/machine/powerpc/vfscanf.c     |  10 +--
 newlib/libc/machine/spu/fdopen.c          |   2 +-
 newlib/libc/machine/spu/fopen.c           |   8 +--
 newlib/libc/machine/spu/fputs.c           |   4 +-
 newlib/libc/machine/spu/freopen.c         |   4 +-
 newlib/libc/machine/spu/fsetpos.c         |   4 +-
 newlib/libc/machine/spu/fwrite.c          |   4 +-
 newlib/libc/machine/spu/impure.c          |   2 +-
 newlib/libc/machine/spu/perror.c          |   4 +-
 newlib/libc/machine/spu/puts.c            |   2 +-
 newlib/libc/machine/spu/remove.c          |   2 +-
 newlib/libc/machine/spu/rename.c          |   8 +--
 newlib/libc/machine/spu/sys/errno.h       |   2 +-
 newlib/libc/machine/spu/vfprintf.c        |   2 +-
 newlib/libc/machine/spu/vfscanf.c         |   2 +-
 newlib/libc/machine/spu/vprintf.c         |   4 +-
 newlib/libc/machine/spu/vscanf.c          |   2 +-
 newlib/libc/machine/spu/vsnprintf.c       |   4 +-
 newlib/libc/machine/spu/vsprintf.c        |   2 +-
 newlib/libc/machine/spu/vsscanf.c         |   8 +--
 newlib/libc/machine/xscale/strlen.c       |   2 +-
 newlib/libc/misc/__dprintf.c              |   4 +-
 newlib/libc/misc/unctrl.c                 |   4 +-
 newlib/libc/posix/execl.c                 |  14 ++--
 newlib/libc/posix/execle.c                |  18 ++---
 newlib/libc/posix/execlp.c                |  14 ++--
 newlib/libc/posix/execv.c                 |   2 +-
 newlib/libc/posix/execvp.c                |   4 +-
 newlib/libc/posix/posix_spawn.c           |  52 +++++++-------
 newlib/libc/reent/execr.c                 |   6 +-
 newlib/libc/reent/impure.c                |   2 +-
 newlib/libc/reent/linkr.c                 |   4 +-
 newlib/libc/reent/mkdirr.c                |   2 +-
 newlib/libc/reent/open64r.c               |   2 +-
 newlib/libc/reent/openr.c                 |   2 +-
 newlib/libc/reent/renamer.c               |   4 +-
 newlib/libc/reent/stat64r.c               |   2 +-
 newlib/libc/reent/statr.c                 |   2 +-
 newlib/libc/reent/unlinkr.c               |   2 +-
 newlib/libc/reent/writer.c                |   2 +-
 newlib/libc/search/bsearch.c              |   4 +-
 newlib/libc/signal/psignal.c              |   2 +-
 newlib/libc/stdio/fdopen.c                |   4 +-
 newlib/libc/stdio/fiscanf.c               |   4 +-
 newlib/libc/stdio/fopen.c                 |   8 +--
 newlib/libc/stdio/fputs.c                 |   6 +-
 newlib/libc/stdio/freopen.c               |   4 +-
 newlib/libc/stdio/fscanf.c                |   4 +-
 newlib/libc/stdio/fsetpos.c               |   4 +-
 newlib/libc/stdio/fvwrite.c               |   2 +-
 newlib/libc/stdio/fvwrite.h               |   2 +-
 newlib/libc/stdio/fwrite.c                |   6 +-
 newlib/libc/stdio/fwscanf.c               |   4 +-
 newlib/libc/stdio/iscanf.c                |   4 +-
 newlib/libc/stdio/local.h                 |  24 +++----
 newlib/libc/stdio/nano-vfprintf.c         |  14 ++--
 newlib/libc/stdio/nano-vfprintf_float.c   |   2 +-
 newlib/libc/stdio/nano-vfprintf_i.c       |   4 +-
 newlib/libc/stdio/nano-vfprintf_local.h   |   6 +-
 newlib/libc/stdio/nano-vfscanf.c          |   8 +--
 newlib/libc/stdio/perror.c                |   4 +-
 newlib/libc/stdio/puts.c                  |   4 +-
 newlib/libc/stdio/putw.c                  |   2 +-
 newlib/libc/stdio/remove.c                |   4 +-
 newlib/libc/stdio/rename.c                |   4 +-
 newlib/libc/stdio/scanf.c                 |   4 +-
 newlib/libc/stdio/siprintf.c              |   8 +--
 newlib/libc/stdio/siscanf.c               |  16 ++---
 newlib/libc/stdio/sniprintf.c             |   8 +--
 newlib/libc/stdio/snprintf.c              |   8 +--
 newlib/libc/stdio/sprintf.c               |   8 +--
 newlib/libc/stdio/sscanf.c                |  16 ++---
 newlib/libc/stdio/swprintf.c              |   4 +-
 newlib/libc/stdio/swscanf.c               |   4 +-
 newlib/libc/stdio/tmpnam.c                |  14 ++--
 newlib/libc/stdio/vfprintf.c              |  34 +++++-----
 newlib/libc/stdio/vfscanf.c               |  10 +--
 newlib/libc/stdio/vfwprintf.c             |  16 ++---
 newlib/libc/stdio/vfwscanf.c              |  10 +--
 newlib/libc/stdio/viprintf.c              |   4 +-
 newlib/libc/stdio/viscanf.c               |   4 +-
 newlib/libc/stdio/vprintf.c               |   4 +-
 newlib/libc/stdio/vscanf.c                |   4 +-
 newlib/libc/stdio/vsiscanf.c              |   8 +--
 newlib/libc/stdio/vsscanf.c               |   8 +--
 newlib/libc/stdio/vswscanf.c              |   4 +-
 newlib/libc/stdio/vwprintf.c              |   4 +-
 newlib/libc/stdio/vwscanf.c               |   4 +-
 newlib/libc/stdio/wscanf.c                |   4 +-
 newlib/libc/stdio64/fdopen64.c            |   4 +-
 newlib/libc/stdio64/fopen64.c             |   8 +--
 newlib/libc/stdio64/freopen64.c           |   8 +--
 newlib/libc/stdio64/fsetpos64.c           |   4 +-
 newlib/libc/stdlib/__exp10.c              |   2 +-
 newlib/libc/stdlib/atof.c                 |   2 +-
 newlib/libc/stdlib/atoff.c                |   2 +-
 newlib/libc/stdlib/atoi.c                 |   4 +-
 newlib/libc/stdlib/atol.c                 |   4 +-
 newlib/libc/stdlib/atoll.c                |   4 +-
 newlib/libc/stdlib/gdtoa-gethex.c         |   6 +-
 newlib/libc/stdlib/gdtoa-hexnan.c         |  12 ++--
 newlib/libc/stdlib/getenv.c               |   4 +-
 newlib/libc/stdlib/getenv_r.c             |   6 +-
 newlib/libc/stdlib/ldtoa.c                | 108 +++++++++++++++---------------
 newlib/libc/stdlib/mprec.c                |  14 ++--
 newlib/libc/stdlib/mprec.h                |  12 ++--
 newlib/libc/stdlib/setenv.c               |   6 +-
 newlib/libc/stdlib/setenv_r.c             |   6 +-
 newlib/libc/stdlib/strtod.c               |  14 ++--
 newlib/libc/stdlib/strtol.c               |   4 +-
 newlib/libc/stdlib/strtoll.c              |   6 +-
 newlib/libc/stdlib/strtoul.c              |   4 +-
 newlib/libc/stdlib/strtoull.c             |   4 +-
 newlib/libc/stdlib/system.c               |  10 +--
 newlib/libc/stdlib/wcstod.c               |   8 +--
 newlib/libc/stdlib/wcstol.c               |   4 +-
 newlib/libc/stdlib/wcstoll.c              |   4 +-
 newlib/libc/stdlib/wcstoul.c              |   4 +-
 newlib/libc/stdlib/wcstoull.c             |   4 +-
 newlib/libc/string/bcmp.c                 |   4 +-
 newlib/libc/string/bcopy.c                |   2 +-
 newlib/libc/string/index.c                |   2 +-
 newlib/libc/string/memccpy.c              |   6 +-
 newlib/libc/string/memchr.c               |   4 +-
 newlib/libc/string/memcmp.c               |   4 +-
 newlib/libc/string/memcpy.c               |   6 +-
 newlib/libc/string/memmove.c              |   8 +--
 newlib/libc/string/mempcpy.c              |   6 +-
 newlib/libc/string/memrchr.c              |   4 +-
 newlib/libc/string/rawmemchr.c            |   4 +-
 newlib/libc/string/rindex.c               |   2 +-
 newlib/libc/string/stpcpy.c               |   4 +-
 newlib/libc/string/stpncpy.c              |   4 +-
 newlib/libc/string/strcasecmp.c           |   8 +--
 newlib/libc/string/strcasestr.c           |   4 +-
 newlib/libc/string/strcat.c               |   2 +-
 newlib/libc/string/strchr.c               |   4 +-
 newlib/libc/string/strchrnul.c            |   2 +-
 newlib/libc/string/strcmp.c               |   4 +-
 newlib/libc/string/strcoll.c              |   4 +-
 newlib/libc/string/strcpy.c               |   6 +-
 newlib/libc/string/strcspn.c              |   8 +--
 newlib/libc/string/strdup.c               |   2 +-
 newlib/libc/string/strdup_r.c             |   2 +-
 newlib/libc/string/strlcat.c              |   2 +-
 newlib/libc/string/strlcpy.c              |   2 +-
 newlib/libc/string/strlen.c               |   4 +-
 newlib/libc/string/strncasecmp.c          |   8 +--
 newlib/libc/string/strncat.c              |   2 +-
 newlib/libc/string/strncmp.c              |   4 +-
 newlib/libc/string/strncpy.c              |   8 +--
 newlib/libc/string/strndup.c              |   2 +-
 newlib/libc/string/strndup_r.c            |   4 +-
 newlib/libc/string/strnlen.c              |   4 +-
 newlib/libc/string/strpbrk.c              |   6 +-
 newlib/libc/string/strrchr.c              |   4 +-
 newlib/libc/string/strspn.c               |   8 +--
 newlib/libc/string/strstr.c               |   4 +-
 newlib/libc/string/strxfrm.c              |   2 +-
 newlib/libc/string/swab.c                 |   2 +-
 newlib/libc/string/wcpcpy.c               |   2 +-
 newlib/libc/string/wcpncpy.c              |   2 +-
 newlib/libc/string/wcscasecmp.c           |   4 +-
 newlib/libc/string/wcscat.c               |   4 +-
 newlib/libc/string/wcschr.c               |   4 +-
 newlib/libc/string/wcscmp.c               |   4 +-
 newlib/libc/string/wcscoll.c              |   4 +-
 newlib/libc/string/wcscpy.c               |   4 +-
 newlib/libc/string/wcscspn.c              |   8 +--
 newlib/libc/string/wcslcat.c              |   4 +-
 newlib/libc/string/wcslcpy.c              |   4 +-
 newlib/libc/string/wcslen.c               |   4 +-
 newlib/libc/string/wcsncasecmp.c          |   4 +-
 newlib/libc/string/wcsncat.c              |   4 +-
 newlib/libc/string/wcsncmp.c              |   4 +-
 newlib/libc/string/wcsncpy.c              |   2 +-
 newlib/libc/string/wcsnlen.c              |   4 +-
 newlib/libc/string/wcspbrk.c              |   8 +--
 newlib/libc/string/wcsrchr.c              |   4 +-
 newlib/libc/string/wcsspn.c               |   8 +--
 newlib/libc/string/wcsstr.c               |  10 +--
 newlib/libc/string/wcswidth.c             |   2 +-
 newlib/libc/string/wcsxfrm.c              |   2 +-
 newlib/libc/string/wcwidth.c              |   4 +-
 newlib/libc/string/wmemchr.c              |   2 +-
 newlib/libc/string/wmemcmp.c              |   4 +-
 newlib/libc/string/wmemcpy.c              |   2 +-
 newlib/libc/string/wmemmove.c             |   2 +-
 newlib/libc/string/wmempcpy.c             |   2 +-
 newlib/libc/sys/linux/getpwent.c          |   2 +-
 newlib/libc/sys/linux/pwrite.c            |   4 +-
 newlib/libc/sys/linux/sys/errno.h         |   2 +-
 newlib/libc/sys/phoenix/sys/errno.h       |   2 +-
 newlib/libc/syscalls/sysexecve.c          |   6 +-
 newlib/libc/syscalls/syslink.c            |   4 +-
 newlib/libc/syscalls/sysstat.c            |   2 +-
 newlib/libc/syscalls/sysunlink.c          |   2 +-
 newlib/libc/time/asctime.c                |   2 +-
 newlib/libc/time/asctime_r.c              |   6 +-
 newlib/libc/time/ctime.c                  |   2 +-
 newlib/libc/time/ctime_r.c                |   2 +-
 newlib/libc/time/gmtime.c                 |   2 +-
 newlib/libc/time/gmtime_r.c               |   4 +-
 newlib/libc/time/lcltime.c                |   2 +-
 newlib/libc/time/lcltime_r.c              |   6 +-
 newlib/libc/time/local.h                  |   2 +-
 newlib/libc/time/mktime.c                 |   4 +-
 newlib/libc/time/month_lengths.c          |   2 +-
 newlib/libc/time/strftime.c               |   8 +--
 newlib/libc/time/strptime.c               |   2 +-
 newlib/libc/time/tzcalc_limits.c          |   6 +-
 newlib/libc/unix/getut.c                  |   2 +-
 newlib/libc/unix/pwrite.c                 |   4 +-
 newlib/libc/xdr/xdr_mem.c                 |  24 +++----
 newlib/libc/xdr/xdr_private.c             |   4 +-
 newlib/libc/xdr/xdr_rec.c                 |  14 ++--
 newlib/libc/xdr/xdr_sizeof.c              |   4 +-
 newlib/libc/xdr/xdr_stdio.c               |  14 ++--
 newlib/libm/test/string.c                 |   2 +-
 newlib/libm/test/test.c                   |   4 +-
 newlib/libm/test/test.h                   |   2 +-
 winsup/cygwin/libc/strptime.cc            |   2 +-
 322 files changed, 1145 insertions(+), 1147 deletions(-)

diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
index 9e3cdcf05..28727e8a8 100644
--- a/newlib/libc/ctype/ctype_.c
+++ b/newlib/libc/ctype/ctype_.c
@@ -87,7 +87,7 @@ static char sccsid[] = "@(#)ctype_.c 5.6 (Berkeley) 6/1/90";
 /* No static const on Cygwin since it's referenced and potentially overwritten
    for compatibility with older applications. */
 #ifndef __CYGWIN__
-_CONST
+const
 #endif
 char _ctype_b[128 + 256] = {
  _CTYPE_DATA_128_255,
@@ -116,7 +116,7 @@ __asm__ (" \n\
 #    endif
 #  else /* !__CYGWIN__ */
 
-_CONST char _ctype_[1 + 256] = {
+const char _ctype_[1 + 256] = {
  0,
  _CTYPE_DATA_0_127,
  _CTYPE_DATA_128_255
@@ -125,7 +125,7 @@ _CONST char _ctype_[1 + 256] = {
 
 #else /* !ALLOW_NEGATIVE_CTYPE_INDEX */
 
-_CONST char _ctype_[1 + 256] = {
+const char _ctype_[1 + 256] = {
  0,
  _CTYPE_DATA_0_127,
  _CTYPE_DATA_128_255
diff --git a/newlib/libc/ctype/ctype_.h b/newlib/libc/ctype/ctype_.h
index 5356d3815..a73870b3e 100644
--- a/newlib/libc/ctype/ctype_.h
+++ b/newlib/libc/ctype/ctype_.h
@@ -7,7 +7,7 @@
 #ifdef ALLOW_NEGATIVE_CTYPE_INDEX
 
 #ifndef __CYGWIN__
-  extern _CONST char _ctype_b[];
+  extern const char _ctype_b[];
 #else
   extern char _ctype_b[];
 #endif
diff --git a/newlib/libc/ctype/ctype_cp.h b/newlib/libc/ctype/ctype_cp.h
index 004c1e2e8..9370778a2 100644
--- a/newlib/libc/ctype/ctype_cp.h
+++ b/newlib/libc/ctype/ctype_cp.h
@@ -473,7 +473,7 @@
 #if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
 
 #ifndef __CYGWIN__
-static _CONST
+static const
 #endif
 char __ctype_cp[26][128 + 256] = {
   { _CTYPE_CP437_128_254,
@@ -636,7 +636,7 @@ char __ctype_cp[26][128 + 256] = {
 
 #else /* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
 
-static _CONST char __ctype_cp[26][1 + 256] = {
+static const char __ctype_cp[26][1 + 256] = {
   { 0,
     _CTYPE_DATA_0_127,
     _CTYPE_CP437_128_254,
diff --git a/newlib/libc/ctype/ctype_iso.h b/newlib/libc/ctype/ctype_iso.h
index ed1d5d674..60087dc92 100644
--- a/newlib/libc/ctype/ctype_iso.h
+++ b/newlib/libc/ctype/ctype_iso.h
@@ -277,7 +277,7 @@ extern int __iso_8859_index (const char *charset_ext);
 #if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
 
 #ifndef __CYGWIN__
-static _CONST
+static const
 #endif
 char __ctype_iso[15][128 + 256] = {
   { _CTYPE_ISO_8859_1_128_254,
@@ -374,7 +374,7 @@ char __ctype_iso[15][128 + 256] = {
 
 #else /* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
 
-static _CONST char __ctype_iso[15][1 + 256] = {
+static const char __ctype_iso[15][1 + 256] = {
   { 0,
     _CTYPE_DATA_0_127,
     _CTYPE_ISO_8859_1_128_254,
diff --git a/newlib/libc/iconv/ccs/big5.c b/newlib/libc/iconv/ccs/big5.c
index 45ea59b64..02b20a195 100644
--- a/newlib/libc/iconv/ccs/big5.c
+++ b/newlib/libc/iconv/ccs/big5.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_BIG5) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_big5[] =
 {
  /* Heading Block */
@@ -2972,7 +2972,7 @@ to_ucs_speed_big5[] =
 #if defined (ICONV_TO_UCS_CCS_BIG5) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_big5[] =
 {
  0x00B0, /* Ranges number */
@@ -5092,7 +5092,7 @@ to_ucs_size_big5[] =
 #if defined (ICONV_FROM_UCS_CCS_BIG5) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_big5[] =
 {
  /* Heading Block */
@@ -8407,7 +8407,7 @@ from_ucs_speed_big5[] =
 #if defined (ICONV_FROM_UCS_CCS_BIG5) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_big5[] =
 {
  0x0235, /* Ranges number */
@@ -12579,7 +12579,7 @@ from_ucs_size_big5[] =
  * big5 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_big5 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/ccs.h b/newlib/libc/iconv/ccs/ccs.h
index d17f4ab91..c640b6444 100644
--- a/newlib/libc/iconv/ccs/ccs.h
+++ b/newlib/libc/iconv/ccs/ccs.h
@@ -131,12 +131,12 @@
 typedef struct
 {
   __uint16_t ver;               /* Table version */
-  _CONST char *name;            /* CCS name */
+  const char *name;            /* CCS name */
   __uint16_t bits;              /* CCS's bits number */
   int from_ucs_type;            /* UCS -> CCS table optimization type */
-  _CONST __uint16_t *from_ucs;  /* UCS -> CCS table */
+  const __uint16_t *from_ucs;  /* UCS -> CCS table */
   int to_ucs_type;              /* CCS -> UCS table optimization type */
-  _CONST __uint16_t *to_ucs;    /* CCS -> UCS table */
+  const __uint16_t *to_ucs;    /* CCS -> UCS table */
 } iconv_ccs_t;
 
 /*
@@ -147,11 +147,11 @@ typedef struct
   int bits;               /* CCS's bits number */
   int type;               /* Table type (builtin/external) */
   int optimization;       /* Table optimization type (speed/size) */
-  _CONST __uint16_t *tbl; /* Table's data */
+  const __uint16_t *tbl; /* Table's data */
 } iconv_ccs_desc_t;
 
 /* Array containing all built-in CCS tables */
-extern _CONST iconv_ccs_t *
+extern const iconv_ccs_t *
 _iconv_ccs[];
 
 #endif /* __CCS_H__ */
diff --git a/newlib/libc/iconv/ccs/ccsbi.c b/newlib/libc/iconv/ccs/ccsbi.c
index d79a2ce91..6bb489aa6 100644
--- a/newlib/libc/iconv/ccs/ccsbi.c
+++ b/newlib/libc/iconv/ccs/ccsbi.c
@@ -8,7 +8,7 @@
 /*
  * The following array contains the list of built-in CCS tables.
  */
-_CONST iconv_ccs_t *
+const iconv_ccs_t *
 _iconv_ccs[] =
 {
 #if defined (ICONV_TO_UCS_CCS_CP775) \
diff --git a/newlib/libc/iconv/ccs/ccsbi.h b/newlib/libc/iconv/ccs/ccsbi.h
index 268cac30e..97a88a0e7 100644
--- a/newlib/libc/iconv/ccs/ccsbi.h
+++ b/newlib/libc/iconv/ccs/ccsbi.h
@@ -310,207 +310,207 @@
  */
 #if defined (ICONV_TO_UCS_CCS_BIG5) \
  || defined (ICONV_FROM_UCS_CCS_BIG5)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_big5;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
  || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cns11643_plane1;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
  || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cns11643_plane14;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
  || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cns11643_plane2;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CP775) \
  || defined (ICONV_FROM_UCS_CCS_CP775)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cp775;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CP850) \
  || defined (ICONV_FROM_UCS_CCS_CP850)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cp850;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CP852) \
  || defined (ICONV_FROM_UCS_CCS_CP852)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cp852;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CP855) \
  || defined (ICONV_FROM_UCS_CCS_CP855)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cp855;
 #endif
 #if defined (ICONV_TO_UCS_CCS_CP866) \
  || defined (ICONV_FROM_UCS_CCS_CP866)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_cp866;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_1) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_1;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_10) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_10;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_11) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_11;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_13) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_13;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_14) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_14;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_15) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_15;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_2) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_2;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_3) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_3;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_4) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_4;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_5) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_5;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_6) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_6;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_7) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_7;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_8) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_8;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_9) \
  || defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_8859_9;
 #endif
 #if defined (ICONV_TO_UCS_CCS_ISO_IR_111) \
  || defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_iso_ir_111;
 #endif
 #if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976) \
  || defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_jis_x0201_1976;
 #endif
 #if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
  || defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_jis_x0208_1990;
 #endif
 #if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
  || defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_jis_x0212_1990;
 #endif
 #if defined (ICONV_TO_UCS_CCS_KOI8_R) \
  || defined (ICONV_FROM_UCS_CCS_KOI8_R)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_koi8_r;
 #endif
 #if defined (ICONV_TO_UCS_CCS_KOI8_RU) \
  || defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_koi8_ru;
 #endif
 #if defined (ICONV_TO_UCS_CCS_KOI8_U) \
  || defined (ICONV_FROM_UCS_CCS_KOI8_U)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_koi8_u;
 #endif
 #if defined (ICONV_TO_UCS_CCS_KOI8_UNI) \
  || defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_koi8_uni;
 #endif
 #if defined (ICONV_TO_UCS_CCS_KSX1001) \
  || defined (ICONV_FROM_UCS_CCS_KSX1001)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_ksx1001;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1250) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1250)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1250;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1251) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1251)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1251;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1252) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1252)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1252;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1253) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1253)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1253;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1254) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1254)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1254;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1255) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1255)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1255;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1256) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1256)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1256;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1257) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1257)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1257;
 #endif
 #if defined (ICONV_TO_UCS_CCS_WIN_1258) \
  || defined (ICONV_FROM_UCS_CCS_WIN_1258)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
 _iconv_ccs_win_1258;
 #endif
 
diff --git a/newlib/libc/iconv/ccs/cns11643_plane1.c b/newlib/libc/iconv/ccs/cns11643_plane1.c
index 37e31a9a8..da1c0597c 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane1.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane1.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cns11643_plane1[] =
 {
  /* Heading Block */
@@ -2213,7 +2213,7 @@ to_ucs_speed_cns11643_plane1[] =
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_cns11643_plane1[] =
 {
  0x0042, /* Ranges number */
@@ -3118,7 +3118,7 @@ to_ucs_size_cns11643_plane1[] =
 #if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_cns11643_plane1[] =
 {
  /* Heading Block */
@@ -6367,7 +6367,7 @@ from_ucs_speed_cns11643_plane1[] =
 #if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_cns11643_plane1[] =
 {
  0x017D, /* Ranges number */
@@ -11175,7 +11175,7 @@ from_ucs_size_cns11643_plane1[] =
  * cns11643_plane1 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cns11643_plane1 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane14.c b/newlib/libc/iconv/ccs/cns11643_plane14.c
index 18230d5ab..507cdef65 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane14.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane14.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cns11643_plane14[] =
 {
  /* Heading Block */
@@ -2411,7 +2411,7 @@ to_ucs_speed_cns11643_plane14[] =
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_cns11643_plane14[] =
 {
  0x00DE, /* Ranges number */
@@ -4011,7 +4011,7 @@ to_ucs_size_cns11643_plane14[] =
 #if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_cns11643_plane14[] =
 {
  /* Heading Block */
@@ -6765,7 +6765,7 @@ from_ucs_speed_cns11643_plane14[] =
 #if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_cns11643_plane14[] =
 {
  0x00C5, /* Ranges number */
@@ -10727,7 +10727,7 @@ from_ucs_size_cns11643_plane14[] =
  * cns11643_plane14 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cns11643_plane14 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane2.c b/newlib/libc/iconv/ccs/cns11643_plane2.c
index c591ce38d..15c287f0b 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane2.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane2.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cns11643_plane2[] =
 {
  /* Heading Block */
@@ -2774,7 +2774,7 @@ to_ucs_speed_cns11643_plane2[] =
 #if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_cns11643_plane2[] =
 {
  0x0052, /* Ranges number */
@@ -3936,7 +3936,7 @@ to_ucs_size_cns11643_plane2[] =
 #if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_cns11643_plane2[] =
 {
  /* Heading Block */
@@ -6690,7 +6690,7 @@ from_ucs_speed_cns11643_plane2[] =
 #if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_cns11643_plane2[] =
 {
  0x027E, /* Ranges number */
@@ -11912,7 +11912,7 @@ from_ucs_size_cns11643_plane2[] =
  * cns11643_plane2 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cns11643_plane2 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp775.c b/newlib/libc/iconv/ccs/cp775.c
index c35a87c11..f7c4af58c 100644
--- a/newlib/libc/iconv/ccs/cp775.c
+++ b/newlib/libc/iconv/ccs/cp775.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_CP775)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cp775[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp775[] =
 
 #if defined (ICONV_FROM_UCS_CCS_CP775)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_cp775[] =
 {
  W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_cp775[] =
  * cp775 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cp775 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp850.c b/newlib/libc/iconv/ccs/cp850.c
index 305ae85d1..57f5906d1 100644
--- a/newlib/libc/iconv/ccs/cp850.c
+++ b/newlib/libc/iconv/ccs/cp850.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_CP850)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cp850[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp850[] =
 
 #if defined (ICONV_FROM_UCS_CCS_CP850)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_cp850[] =
 {
  W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp850[] =
  * cp850 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cp850 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp852.c b/newlib/libc/iconv/ccs/cp852.c
index 73a1e0f03..c622da499 100644
--- a/newlib/libc/iconv/ccs/cp852.c
+++ b/newlib/libc/iconv/ccs/cp852.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_CP852)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cp852[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp852[] =
 
 #if defined (ICONV_FROM_UCS_CCS_CP852)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_cp852[] =
 {
  W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp852[] =
  * cp852 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cp852 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp855.c b/newlib/libc/iconv/ccs/cp855.c
index 2add727ea..41c52ed93 100644
--- a/newlib/libc/iconv/ccs/cp855.c
+++ b/newlib/libc/iconv/ccs/cp855.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_CP855)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cp855[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp855[] =
 
 #if defined (ICONV_FROM_UCS_CCS_CP855)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_cp855[] =
 {
  W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp855[] =
  * cp855 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cp855 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp866.c b/newlib/libc/iconv/ccs/cp866.c
index 678ea4232..c1dacd8f1 100644
--- a/newlib/libc/iconv/ccs/cp866.c
+++ b/newlib/libc/iconv/ccs/cp866.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_CP866)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_cp866[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp866[] =
 
 #if defined (ICONV_FROM_UCS_CCS_CP866)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_cp866[] =
 {
  W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_cp866[] =
  * cp866 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_cp866 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_1.c b/newlib/libc/iconv/ccs/iso_8859_1.c
index a23947775..775bca654 100644
--- a/newlib/libc/iconv/ccs/iso_8859_1.c
+++ b/newlib/libc/iconv/ccs/iso_8859_1.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_1)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_1[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_1[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_1[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -185,7 +185,7 @@ from_ucs_speed_iso_8859_1[] =
  * iso_8859_1 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_1 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_10.c b/newlib/libc/iconv/ccs/iso_8859_10.c
index 1848afd66..b221a6a82 100644
--- a/newlib/libc/iconv/ccs/iso_8859_10.c
+++ b/newlib/libc/iconv/ccs/iso_8859_10.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_10)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_10[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_10[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_10[] =
 {
  W(0x0138), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_10[] =
  * iso_8859_10 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_10 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_11.c b/newlib/libc/iconv/ccs/iso_8859_11.c
index 97cc0757e..ebb5ec6d9 100644
--- a/newlib/libc/iconv/ccs/iso_8859_11.c
+++ b/newlib/libc/iconv/ccs/iso_8859_11.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_11)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_11[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_11[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_11[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_11[] =
  * iso_8859_11 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_11 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_13.c b/newlib/libc/iconv/ccs/iso_8859_13.c
index 88a2a6f40..3905cef65 100644
--- a/newlib/libc/iconv/ccs/iso_8859_13.c
+++ b/newlib/libc/iconv/ccs/iso_8859_13.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_13)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_13[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_13[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_13[] =
 {
  W(0x2019), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_13[] =
  * iso_8859_13 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_13 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_14.c b/newlib/libc/iconv/ccs/iso_8859_14.c
index 28052a7b7..114d2df33 100644
--- a/newlib/libc/iconv/ccs/iso_8859_14.c
+++ b/newlib/libc/iconv/ccs/iso_8859_14.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_14)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_14[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_14[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_14[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_14[] =
  * iso_8859_14 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_14 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_15.c b/newlib/libc/iconv/ccs/iso_8859_15.c
index da3cfc3bb..52dff022b 100644
--- a/newlib/libc/iconv/ccs/iso_8859_15.c
+++ b/newlib/libc/iconv/ccs/iso_8859_15.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_15)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_15[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_15[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_15[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_15[] =
  * iso_8859_15 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_15 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_2.c b/newlib/libc/iconv/ccs/iso_8859_2.c
index 5a1966632..ecb374e4d 100644
--- a/newlib/libc/iconv/ccs/iso_8859_2.c
+++ b/newlib/libc/iconv/ccs/iso_8859_2.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_2)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_2[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_2[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_2[] =
 {
  W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_2[] =
  * iso_8859_2 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_2 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_3.c b/newlib/libc/iconv/ccs/iso_8859_3.c
index a69fcb362..6f8003402 100644
--- a/newlib/libc/iconv/ccs/iso_8859_3.c
+++ b/newlib/libc/iconv/ccs/iso_8859_3.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_3)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_3[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_3[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_3[] =
 {
  W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_3[] =
  * iso_8859_3 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_3 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_4.c b/newlib/libc/iconv/ccs/iso_8859_4.c
index 0cec45823..b080e2d29 100644
--- a/newlib/libc/iconv/ccs/iso_8859_4.c
+++ b/newlib/libc/iconv/ccs/iso_8859_4.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_4)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_4[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_4[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_4[] =
 {
  W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_4[] =
  * iso_8859_4 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_4 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_5.c b/newlib/libc/iconv/ccs/iso_8859_5.c
index e4765ffef..b4b0c3f47 100644
--- a/newlib/libc/iconv/ccs/iso_8859_5.c
+++ b/newlib/libc/iconv/ccs/iso_8859_5.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_5)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_5[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_5[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_5[] =
 {
  W(0x045F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_5[] =
  * iso_8859_5 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_5 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_6.c b/newlib/libc/iconv/ccs/iso_8859_6.c
index 783cf1f36..9967841f4 100644
--- a/newlib/libc/iconv/ccs/iso_8859_6.c
+++ b/newlib/libc/iconv/ccs/iso_8859_6.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_6)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_6[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_6[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_6[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_6[] =
  * iso_8859_6 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_6 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_7.c b/newlib/libc/iconv/ccs/iso_8859_7.c
index e964a02e6..41d3400ce 100644
--- a/newlib/libc/iconv/ccs/iso_8859_7.c
+++ b/newlib/libc/iconv/ccs/iso_8859_7.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_7)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_7[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_7[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_7[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_7[] =
  * iso_8859_7 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_7 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_8.c b/newlib/libc/iconv/ccs/iso_8859_8.c
index bf49604db..029a4b873 100644
--- a/newlib/libc/iconv/ccs/iso_8859_8.c
+++ b/newlib/libc/iconv/ccs/iso_8859_8.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_8)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_8[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_8[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_8[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_8[] =
  * iso_8859_8 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_8 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_9.c b/newlib/libc/iconv/ccs/iso_8859_9.c
index 20fbb8424..b787b9815 100644
--- a/newlib/libc/iconv/ccs/iso_8859_9.c
+++ b/newlib/libc/iconv/ccs/iso_8859_9.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_8859_9)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_8859_9[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_9[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_8859_9[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_9[] =
  * iso_8859_9 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_8859_9 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_ir_111.c b/newlib/libc/iconv/ccs/iso_ir_111.c
index 0e9bcc4da..7d05ef4d5 100644
--- a/newlib/libc/iconv/ccs/iso_ir_111.c
+++ b/newlib/libc/iconv/ccs/iso_ir_111.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_ISO_IR_111)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_iso_ir_111[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_ir_111[] =
 
 #if defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_iso_ir_111[] =
 {
  W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_ir_111[] =
  * iso_ir_111 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_iso_ir_111 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0201_1976.c b/newlib/libc/iconv/ccs/jis_x0201_1976.c
index e5cdb5fdd..ca949861d 100644
--- a/newlib/libc/iconv/ccs/jis_x0201_1976.c
+++ b/newlib/libc/iconv/ccs/jis_x0201_1976.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_jis_x0201_1976[] =
 {
  INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
@@ -75,7 +75,7 @@ to_ucs_speed_jis_x0201_1976[] =
 
 #if defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_jis_x0201_1976[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -185,7 +185,7 @@ from_ucs_speed_jis_x0201_1976[] =
  * jis_x0201_1976 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_jis_x0201_1976 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0208_1990.c b/newlib/libc/iconv/ccs/jis_x0208_1990.c
index c12d13482..070e0e4b0 100644
--- a/newlib/libc/iconv/ccs/jis_x0208_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0208_1990.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_jis_x0208_1990[] =
 {
  /* Heading Block */
@@ -2609,7 +2609,7 @@ to_ucs_speed_jis_x0208_1990[] =
 #if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_jis_x0208_1990[] =
 {
  0x0055, /* Ranges number */
@@ -3684,7 +3684,7 @@ to_ucs_size_jis_x0208_1990[] =
 #if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_jis_x0208_1990[] =
 {
  /* Heading Block */
@@ -6801,7 +6801,7 @@ from_ucs_speed_jis_x0208_1990[] =
 #if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_jis_x0208_1990[] =
 {
  0x01E9, /* Ranges number */
@@ -12125,7 +12125,7 @@ from_ucs_size_jis_x0208_1990[] =
  * jis_x0208_1990 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_jis_x0208_1990 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0212_1990.c b/newlib/libc/iconv/ccs/jis_x0212_1990.c
index eb8882f46..613de7d35 100644
--- a/newlib/libc/iconv/ccs/jis_x0212_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0212_1990.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_jis_x0212_1990[] =
 {
  /* Heading Block */
@@ -2312,7 +2312,7 @@ to_ucs_speed_jis_x0212_1990[] =
 #if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_jis_x0212_1990[] =
 {
  0x0049, /* Ranges number */
@@ -3262,7 +3262,7 @@ to_ucs_size_jis_x0212_1990[] =
 #if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_jis_x0212_1990[] =
 {
  /* Heading Block */
@@ -6214,7 +6214,7 @@ from_ucs_speed_jis_x0212_1990[] =
 #if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_jis_x0212_1990[] =
 {
  0x01AA, /* Ranges number */
@@ -11349,7 +11349,7 @@ from_ucs_size_jis_x0212_1990[] =
  * jis_x0212_1990 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_jis_x0212_1990 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_r.c b/newlib/libc/iconv/ccs/koi8_r.c
index cccb7c1d5..698652e74 100644
--- a/newlib/libc/iconv/ccs/koi8_r.c
+++ b/newlib/libc/iconv/ccs/koi8_r.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_KOI8_R)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_koi8_r[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_r[] =
 
 #if defined (ICONV_FROM_UCS_CCS_KOI8_R)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_koi8_r[] =
 {
  W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_koi8_r[] =
  * koi8_r CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_koi8_r =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_ru.c b/newlib/libc/iconv/ccs/koi8_ru.c
index 704ce95b0..956dc7802 100644
--- a/newlib/libc/iconv/ccs/koi8_ru.c
+++ b/newlib/libc/iconv/ccs/koi8_ru.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_KOI8_RU)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_koi8_ru[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_ru[] =
 
 #if defined (ICONV_FROM_UCS_CCS_KOI8_RU)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_koi8_ru[] =
 {
  W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_koi8_ru[] =
  * koi8_ru CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_koi8_ru =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_u.c b/newlib/libc/iconv/ccs/koi8_u.c
index ebe0c9172..d271e7e88 100644
--- a/newlib/libc/iconv/ccs/koi8_u.c
+++ b/newlib/libc/iconv/ccs/koi8_u.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_KOI8_U)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_koi8_u[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_u[] =
 
 #if defined (ICONV_FROM_UCS_CCS_KOI8_U)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_koi8_u[] =
 {
  W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_koi8_u[] =
  * koi8_u CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_koi8_u =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_uni.c b/newlib/libc/iconv/ccs/koi8_uni.c
index 5596c2d91..4523d1c78 100644
--- a/newlib/libc/iconv/ccs/koi8_uni.c
+++ b/newlib/libc/iconv/ccs/koi8_uni.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_KOI8_UNI)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_koi8_uni[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_uni[] =
 
 #if defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_koi8_uni[] =
 {
  W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_koi8_uni[] =
  * koi8_uni CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_koi8_uni =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/ksx1001.c b/newlib/libc/iconv/ccs/ksx1001.c
index ad2c30d73..5690e4acc 100644
--- a/newlib/libc/iconv/ccs/ksx1001.c
+++ b/newlib/libc/iconv/ccs/ksx1001.c
@@ -21,7 +21,7 @@
 #if defined (ICONV_TO_UCS_CCS_KSX1001) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_ksx1001[] =
 {
  /* Heading Block */
@@ -3005,7 +3005,7 @@ to_ucs_speed_ksx1001[] =
 #if defined (ICONV_TO_UCS_CCS_KSX1001) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_size_ksx1001[] =
 {
  0x005D, /* Ranges number */
@@ -4266,7 +4266,7 @@ to_ucs_size_ksx1001[] =
 #if defined (ICONV_FROM_UCS_CCS_KSX1001) \
  && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_speed_ksx1001[] =
 {
  /* Heading Block */
@@ -9099,7 +9099,7 @@ from_ucs_speed_ksx1001[] =
 #if defined (ICONV_FROM_UCS_CCS_KSX1001) \
  && (defined (TABLE_USE_SIZE_OPTIMIZATION))
 
-static _CONST __uint16_t
+static const __uint16_t
 from_ucs_size_ksx1001[] =
 {
  0x01B6, /* Ranges number */
@@ -15576,7 +15576,7 @@ from_ucs_size_ksx1001[] =
  * ksx1001 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_ksx1001 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/mktbl.pl b/newlib/libc/iconv/ccs/mktbl.pl
index c3b87932b..633511e4d 100755
--- a/newlib/libc/iconv/ccs/mktbl.pl
+++ b/newlib/libc/iconv/ccs/mktbl.pl
@@ -343,7 +343,7 @@ if ($Source)
  * $CCSName CCS description table.
  * $Separator
  */
-_CONST $TypeBICCS
+const $TypeBICCS
 $VarBICCS =
 {
 \t$MacroVer1Table, /* Table version */
@@ -807,7 +807,7 @@ sub Output8bitToUCS(;$)
  */
 #if defined ($GuardToUCS)
 
-static _CONST __uint16_t
+static const __uint16_t
 ${VarToUCSSpeed}\[] =
 {\n\t";
   }
@@ -872,7 +872,7 @@ sub Output8bitFromUCS(;$)
 
 #if defined ($GuardFromUCS)
 
-static _CONST unsigned char
+static const unsigned char
 ${VarFromUCSSpeed}\[] =
 {
 ";
@@ -995,7 +995,7 @@ sub OutputSpeed($;$)
 #if defined ($GuardToUCS) \\
  && !($GuardSize)
 
-static _CONST __uint16_t
+static const __uint16_t
 ${VarToUCSSpeed}\[] =
 {
 ";
@@ -1018,7 +1018,7 @@ ${VarToUCSSpeed}\[] =
 #if defined ($GuardFromUCS) \\
  && !($GuardSize)
 
-static _CONST __uint16_t
+static const __uint16_t
 ${VarFromUCSSpeed}\[] =
 {
 ";
@@ -1149,7 +1149,7 @@ sub OutputSize($;$)
 #if defined ($GuardToUCS) \\
  && ($GuardSize)
 
-static _CONST __uint16_t
+static const __uint16_t
 ${VarToUCSSize}\[] =
 {
 ";
@@ -1171,7 +1171,7 @@ ${VarToUCSSize}\[] =
 #if defined ($GuardFromUCS) \\
  && ($GuardSize)
 
-static _CONST __uint16_t
+static const __uint16_t
 ${VarFromUCSSize}\[] =
 {
 ";
diff --git a/newlib/libc/iconv/ccs/win_1250.c b/newlib/libc/iconv/ccs/win_1250.c
index e43eb8d3e..d86d6a0ad 100644
--- a/newlib/libc/iconv/ccs/win_1250.c
+++ b/newlib/libc/iconv/ccs/win_1250.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1250)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1250[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1250[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1250)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1250[] =
 {
  W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1250[] =
  * win_1250 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1250 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1251.c b/newlib/libc/iconv/ccs/win_1251.c
index 7e9b4c339..195fc0a60 100644
--- a/newlib/libc/iconv/ccs/win_1251.c
+++ b/newlib/libc/iconv/ccs/win_1251.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1251)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1251[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1251[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1251)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1251[] =
 {
  W(0x044F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_win_1251[] =
  * win_1251 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1251 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1252.c b/newlib/libc/iconv/ccs/win_1252.c
index 659054fc4..463cabdfb 100644
--- a/newlib/libc/iconv/ccs/win_1252.c
+++ b/newlib/libc/iconv/ccs/win_1252.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1252)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1252[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1252[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1252)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1252[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1252[] =
  * win_1252 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1252 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1253.c b/newlib/libc/iconv/ccs/win_1253.c
index 450813320..c9abd81da 100644
--- a/newlib/libc/iconv/ccs/win_1253.c
+++ b/newlib/libc/iconv/ccs/win_1253.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1253)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1253[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1253[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1253)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1253[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1253[] =
  * win_1253 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1253 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1254.c b/newlib/libc/iconv/ccs/win_1254.c
index 3c1599add..05ed88efb 100644
--- a/newlib/libc/iconv/ccs/win_1254.c
+++ b/newlib/libc/iconv/ccs/win_1254.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1254)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1254[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1254[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1254)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1254[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1254[] =
  * win_1254 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1254 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1255.c b/newlib/libc/iconv/ccs/win_1255.c
index 937afca5b..47e9c0129 100644
--- a/newlib/libc/iconv/ccs/win_1255.c
+++ b/newlib/libc/iconv/ccs/win_1255.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1255)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1255[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1255[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1255)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1255[] =
 {
  W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1255[] =
  * win_1255 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1255 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1256.c b/newlib/libc/iconv/ccs/win_1256.c
index 44d451987..93a1f074d 100644
--- a/newlib/libc/iconv/ccs/win_1256.c
+++ b/newlib/libc/iconv/ccs/win_1256.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1256)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1256[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1256[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1256)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1256[] =
 {
  W(0x06D2), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1256[] =
  * win_1256 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1256 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1257.c b/newlib/libc/iconv/ccs/win_1257.c
index ad497cbf4..4f9fa39a7 100644
--- a/newlib/libc/iconv/ccs/win_1257.c
+++ b/newlib/libc/iconv/ccs/win_1257.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1257)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1257[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1257[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1257)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1257[] =
 {
  W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1257[] =
  * win_1257 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1257 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1258.c b/newlib/libc/iconv/ccs/win_1258.c
index 7331d78d9..42ec24724 100644
--- a/newlib/libc/iconv/ccs/win_1258.c
+++ b/newlib/libc/iconv/ccs/win_1258.c
@@ -28,7 +28,7 @@
  */
 #if defined (ICONV_TO_UCS_CCS_WIN_1258)
 
-static _CONST __uint16_t
+static const __uint16_t
 to_ucs_speed_win_1258[] =
 {
  0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1258[] =
 
 #if defined (ICONV_FROM_UCS_CCS_WIN_1258)
 
-static _CONST unsigned char
+static const unsigned char
 from_ucs_speed_win_1258[] =
 {
  W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1258[] =
  * win_1258 CCS description table.
  * ======================================================================
  */
-_CONST iconv_ccs_t
+const iconv_ccs_t
 _iconv_ccs_win_1258 =
 {
  TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ces/cesbi.c b/newlib/libc/iconv/ces/cesbi.c
index c2e6520a3..5fa5d1b4c 100644
--- a/newlib/libc/iconv/ces/cesbi.c
+++ b/newlib/libc/iconv/ces/cesbi.c
@@ -12,7 +12,7 @@
  */
 #if defined (ICONV_TO_UCS_CES_EUC) \
  || defined (ICONV_FROM_UCS_CES_EUC)
-static _CONST char *
+static const char *
 iconv_ces_names_euc[] =
 {
 # if defined (_ICONV_FROM_ENCODING_EUC_JP) \
@@ -33,7 +33,7 @@ iconv_ces_names_euc[] =
 
 #if defined (ICONV_TO_UCS_CES_TABLE) \
  || defined (ICONV_FROM_UCS_CES_TABLE)
-static _CONST char *
+static const char *
 iconv_ces_names_table[] =
 {
 # if defined (_ICONV_FROM_ENCODING_CP775) \
@@ -174,7 +174,7 @@ iconv_ces_names_table[] =
 
 #if defined (ICONV_TO_UCS_CES_TABLE_PCS) \
  || defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-static _CONST char *
+static const char *
 iconv_ces_names_table_pcs[] =
 {
 # if defined (_ICONV_FROM_ENCODING_BIG5) \
@@ -187,7 +187,7 @@ iconv_ces_names_table_pcs[] =
 
 #if defined (ICONV_TO_UCS_CES_UCS_2) \
  || defined (ICONV_FROM_UCS_CES_UCS_2)
-static _CONST char *
+static const char *
 iconv_ces_names_ucs_2[] =
 {
 # if defined (_ICONV_FROM_ENCODING_UCS_2) \
@@ -208,7 +208,7 @@ iconv_ces_names_ucs_2[] =
 
 #if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) \
  || defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-static _CONST char *
+static const char *
 iconv_ces_names_ucs_2_internal[] =
 {
 # if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL) \
@@ -221,7 +221,7 @@ iconv_ces_names_ucs_2_internal[] =
 
 #if defined (ICONV_TO_UCS_CES_UCS_4) \
  || defined (ICONV_FROM_UCS_CES_UCS_4)
-static _CONST char *
+static const char *
 iconv_ces_names_ucs_4[] =
 {
 # if defined (_ICONV_FROM_ENCODING_UCS_4) \
@@ -242,7 +242,7 @@ iconv_ces_names_ucs_4[] =
 
 #if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) \
  || defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-static _CONST char *
+static const char *
 iconv_ces_names_ucs_4_internal[] =
 {
 # if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL) \
@@ -255,7 +255,7 @@ iconv_ces_names_ucs_4_internal[] =
 
 #if defined (ICONV_TO_UCS_CES_US_ASCII) \
  || defined (ICONV_FROM_UCS_CES_US_ASCII)
-static _CONST char *
+static const char *
 iconv_ces_names_us_ascii[] =
 {
 # if defined (_ICONV_FROM_ENCODING_US_ASCII) \
@@ -268,7 +268,7 @@ iconv_ces_names_us_ascii[] =
 
 #if defined (ICONV_TO_UCS_CES_UTF_16) \
  || defined (ICONV_FROM_UCS_CES_UTF_16)
-static _CONST char *
+static const char *
 iconv_ces_names_utf_16[] =
 {
 # if defined (_ICONV_FROM_ENCODING_UTF_16) \
@@ -289,7 +289,7 @@ iconv_ces_names_utf_16[] =
 
 #if defined (ICONV_TO_UCS_CES_UTF_8) \
  || defined (ICONV_FROM_UCS_CES_UTF_8)
-static _CONST char *
+static const char *
 iconv_ces_names_utf_8[] =
 {
 # if defined (_ICONV_FROM_ENCODING_UTF_8) \
@@ -303,99 +303,99 @@ iconv_ces_names_utf_8[] =
 /*
  * The following structure contains the list of "to UCS" linked-in CES converters.
  */
-_CONST iconv_to_ucs_ces_t
+const iconv_to_ucs_ces_t
 _iconv_to_ucs_ces[] =
 {
 #ifdef ICONV_TO_UCS_CES_EUC
-  {(_CONST char **)iconv_ces_names_euc,
+  {(const char **)iconv_ces_names_euc,
    &_iconv_to_ucs_ces_handlers_euc},
 #endif
 #ifdef ICONV_TO_UCS_CES_TABLE
-  {(_CONST char **)iconv_ces_names_table,
+  {(const char **)iconv_ces_names_table,
    &_iconv_to_ucs_ces_handlers_table},
 #endif
 #ifdef ICONV_TO_UCS_CES_TABLE_PCS
-  {(_CONST char **)iconv_ces_names_table_pcs,
+  {(const char **)iconv_ces_names_table_pcs,
    &_iconv_to_ucs_ces_handlers_table_pcs},
 #endif
 #ifdef ICONV_TO_UCS_CES_UCS_2
-  {(_CONST char **)iconv_ces_names_ucs_2,
+  {(const char **)iconv_ces_names_ucs_2,
    &_iconv_to_ucs_ces_handlers_ucs_2},
 #endif
 #ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_2_internal,
+  {(const char **)iconv_ces_names_ucs_2_internal,
    &_iconv_to_ucs_ces_handlers_ucs_2_internal},
 #endif
 #ifdef ICONV_TO_UCS_CES_UCS_4
-  {(_CONST char **)iconv_ces_names_ucs_4,
+  {(const char **)iconv_ces_names_ucs_4,
    &_iconv_to_ucs_ces_handlers_ucs_4},
 #endif
 #ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_4_internal,
+  {(const char **)iconv_ces_names_ucs_4_internal,
    &_iconv_to_ucs_ces_handlers_ucs_4_internal},
 #endif
 #ifdef ICONV_TO_UCS_CES_US_ASCII
-  {(_CONST char **)iconv_ces_names_us_ascii,
+  {(const char **)iconv_ces_names_us_ascii,
    &_iconv_to_ucs_ces_handlers_us_ascii},
 #endif
 #ifdef ICONV_TO_UCS_CES_UTF_16
-  {(_CONST char **)iconv_ces_names_utf_16,
+  {(const char **)iconv_ces_names_utf_16,
    &_iconv_to_ucs_ces_handlers_utf_16},
 #endif
 #ifdef ICONV_TO_UCS_CES_UTF_8
-  {(_CONST char **)iconv_ces_names_utf_8,
+  {(const char **)iconv_ces_names_utf_8,
    &_iconv_to_ucs_ces_handlers_utf_8},
 #endif
-  {(_CONST char **)NULL,
+  {(const char **)NULL,
   (iconv_to_ucs_ces_handlers_t *)NULL}
 };
 
 /*
  * The following structure contains the list of "from UCS" linked-in CES converters.
  */
-_CONST iconv_from_ucs_ces_t
+const iconv_from_ucs_ces_t
 _iconv_from_ucs_ces[] =
 {
 #ifdef ICONV_FROM_UCS_CES_EUC
-  {(_CONST char **)iconv_ces_names_euc,
+  {(const char **)iconv_ces_names_euc,
    &_iconv_from_ucs_ces_handlers_euc},
 #endif
 #ifdef ICONV_FROM_UCS_CES_TABLE
-  {(_CONST char **)iconv_ces_names_table,
+  {(const char **)iconv_ces_names_table,
    &_iconv_from_ucs_ces_handlers_table},
 #endif
 #ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-  {(_CONST char **)iconv_ces_names_table_pcs,
+  {(const char **)iconv_ces_names_table_pcs,
    &_iconv_from_ucs_ces_handlers_table_pcs},
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_2
-  {(_CONST char **)iconv_ces_names_ucs_2,
+  {(const char **)iconv_ces_names_ucs_2,
    &_iconv_from_ucs_ces_handlers_ucs_2},
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_2_internal,
+  {(const char **)iconv_ces_names_ucs_2_internal,
    &_iconv_from_ucs_ces_handlers_ucs_2_internal},
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_4
-  {(_CONST char **)iconv_ces_names_ucs_4,
+  {(const char **)iconv_ces_names_ucs_4,
    &_iconv_from_ucs_ces_handlers_ucs_4},
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_4_internal,
+  {(const char **)iconv_ces_names_ucs_4_internal,
    &_iconv_from_ucs_ces_handlers_ucs_4_internal},
 #endif
 #ifdef ICONV_FROM_UCS_CES_US_ASCII
-  {(_CONST char **)iconv_ces_names_us_ascii,
+  {(const char **)iconv_ces_names_us_ascii,
    &_iconv_from_ucs_ces_handlers_us_ascii},
 #endif
 #ifdef ICONV_FROM_UCS_CES_UTF_16
-  {(_CONST char **)iconv_ces_names_utf_16,
+  {(const char **)iconv_ces_names_utf_16,
    &_iconv_from_ucs_ces_handlers_utf_16},
 #endif
 #ifdef ICONV_FROM_UCS_CES_UTF_8
-  {(_CONST char **)iconv_ces_names_utf_8,
+  {(const char **)iconv_ces_names_utf_8,
    &_iconv_from_ucs_ces_handlers_utf_8},
 #endif
-  {(_CONST char **)NULL,
+  {(const char **)NULL,
   (iconv_from_ucs_ces_handlers_t *)NULL}
 };
diff --git a/newlib/libc/iconv/ces/cesbi.h b/newlib/libc/iconv/ces/cesbi.h
index 67e85ef3c..2b157c216 100644
--- a/newlib/libc/iconv/ces/cesbi.h
+++ b/newlib/libc/iconv/ces/cesbi.h
@@ -183,92 +183,92 @@
  * These handlers are actually defined in correspondent CES converter files.
  */
 #ifdef ICONV_TO_UCS_CES_EUC
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_euc;
 #endif
 #ifdef ICONV_FROM_UCS_CES_EUC
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_euc;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_TABLE
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_table;
 #endif
 #ifdef ICONV_FROM_UCS_CES_TABLE
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_table;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_TABLE_PCS
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_table_pcs;
 #endif
 #ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_table_pcs;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_UCS_2
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_2;
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_2
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_2;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_2_internal;
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_2_internal;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_UCS_4
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_4;
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_4
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_4;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_4_internal;
 #endif
 #ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_4_internal;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_US_ASCII
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_us_ascii;
 #endif
 #ifdef ICONV_FROM_UCS_CES_US_ASCII
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_us_ascii;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_UTF_16
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_utf_16;
 #endif
 #ifdef ICONV_FROM_UCS_CES_UTF_16
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_utf_16;
 #endif
 
 #ifdef ICONV_TO_UCS_CES_UTF_8
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_utf_8;
 #endif
 #ifdef ICONV_FROM_UCS_CES_UTF_8
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_utf_8;
 #endif
 
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 62bab771e..ab309a585 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -103,7 +103,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
 static _VOID_PTR
 _DEFUN(euc_from_ucs_init, (rptr, encoding),
                           struct _reent *rptr,
-                          _CONST char *encoding)
+                          const char *encoding)
 {
   int i;
   euc_data_t *data;
@@ -263,7 +263,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static _VOID_PTR
 _DEFUN(euc_to_ucs_init, (rptr, encoding),
                         struct _reent *rptr,
-                        _CONST char *encoding)
+                        const char *encoding)
 {
   int i;
   euc_data_t *data;
@@ -347,7 +347,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
 static ucs4_t
 _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
                            _VOID_PTR data,
-                           _CONST unsigned char **inbuf,
+                           const unsigned char **inbuf,
                            size_t *inbytesleft)
 {
   int i;
@@ -366,8 +366,8 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
 
   for (i = 1; d->desc[i].csname != NULL; i++)
     {
-      if (memcmp((_CONST _VOID_PTR)(*inbuf),
-                 (_CONST _VOID_PTR)d->desc[i].prefix,
+      if (memcmp((const _VOID_PTR)(*inbuf),
+                 (const _VOID_PTR)d->desc[i].prefix,
                  d->desc[i].prefixbytes) == 0)
         {
           if (((int)*inbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
@@ -388,7 +388,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
           
           res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
                                              d->data[i],
-                                             (_CONST unsigned char **)&inbuf1,
+                                             (const unsigned char **)&inbuf1,
                                              &inbytesleft1);
           if (((__int32_t)res) > 0)
             {
@@ -419,7 +419,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
   
   res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
                                         d->data[0],
-                                        (_CONST unsigned char **)&inbuf1,
+                                        (const unsigned char **)&inbuf1,
                                         &inbytesleft1);
   if (((__int32_t)res) > 0)
     {
@@ -439,7 +439,7 @@ _DEFUN(euc_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_FROM_UCS_CES_EUC)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_euc =
 {
   euc_from_ucs_init,
@@ -453,7 +453,7 @@ _iconv_from_ucs_ces_handlers_euc =
 #endif
 
 #if defined (ICONV_TO_UCS_CES_EUC)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_euc =
 {
   euc_to_ucs_init,
diff --git a/newlib/libc/iconv/ces/mkdeps.pl b/newlib/libc/iconv/ces/mkdeps.pl
index 92dd20dfb..d78dfe8f8 100755
--- a/newlib/libc/iconv/ces/mkdeps.pl
+++ b/newlib/libc/iconv/ces/mkdeps.pl
@@ -524,12 +524,12 @@ sub generate_cesbi_h($$)
   foreach my $ces (@ces)
   {
     print CESBI_H "#ifdef $macro_to_ucs_ces\U$ces\n";
-    print CESBI_H "extern _CONST iconv_to_ucs_ces_handlers_t\n";
+    print CESBI_H "extern const iconv_to_ucs_ces_handlers_t\n";
     print CESBI_H "$var_to_ucs_handlers$ces;\n";
     print CESBI_H "#endif\n";
 
     print CESBI_H "#ifdef $macro_from_ucs_ces\U$ces\n";
-    print CESBI_H "extern _CONST iconv_from_ucs_ces_handlers_t\n";
+    print CESBI_H "extern const iconv_from_ucs_ces_handlers_t\n";
     print CESBI_H "$var_from_ucs_handlers$ces;\n";
     print CESBI_H "#endif\n\n";
   }
@@ -584,7 +584,7 @@ sub generate_aliasesbi_c($)
   print ALIASESBI_C "$comment_automatic\n\n";
   print ALIASESBI_C "#include <_ansi.h>\n";
   print ALIASESBI_C "#include \"encnames.h\"\n\n";
-  print ALIASESBI_C "_CONST char *\n";
+  print ALIASESBI_C "const char *\n";
   print ALIASESBI_C "$var_aliases =\n";
   print ALIASESBI_C "{\n";
 
@@ -749,7 +749,7 @@ sub generate_ccsbi_h($)
   {
     print CCSBI_H "#if defined ($macro_to_ucs_ccs\U$ccs) \\\n";
     print CCSBI_H " || defined ($macro_from_ucs_ccs\U$ccs)\n";
-    print CCSBI_H "extern _CONST iconv_ccs_t\n";
+    print CCSBI_H "extern const iconv_ccs_t\n";
     print CCSBI_H "$var_ccs$ccs;\n";
     print CCSBI_H "#endif\n";
   }
@@ -789,7 +789,7 @@ sub generate_cesbi_c($)
   {
     print CESBI_C "#if defined ($macro_to_ucs_ces\U$ces) \\\n";
     print CESBI_C " || defined ($macro_from_ucs_ces\U$ces)\n";
-    print CESBI_C "static _CONST char *\n";
+    print CESBI_C "static const char *\n";
     print CESBI_C "$var_ces_names${ces}\[] =\n";
     print CESBI_C "{\n";
     my @encodings = sort @{$cesenc{$ces}};
@@ -808,36 +808,36 @@ sub generate_cesbi_c($)
   print CESBI_C "/*\n";
   print CESBI_C " * The following structure contains the list of \"to UCS\" linked-in CES converters.\n";
   print CESBI_C " */\n";
-  print CESBI_C "_CONST iconv_to_ucs_ces_t\n";
+  print CESBI_C "const iconv_to_ucs_ces_t\n";
   print CESBI_C "_iconv_to_ucs_ces[] =\n";
   print CESBI_C "{\n";
   
   foreach my $ces (@ces)
   {
     print CESBI_C "#ifdef $macro_to_ucs_ces\U$ces\n";
-    print CESBI_C "  {(_CONST char **)$var_ces_names$ces,\n";
+    print CESBI_C "  {(const char **)$var_ces_names$ces,\n";
     print CESBI_C "   &$var_to_ucs_handlers$ces},\n";
     print CESBI_C "#endif\n";
   }
-  print CESBI_C "  {(_CONST char **)NULL,\n";
+  print CESBI_C "  {(const char **)NULL,\n";
   print CESBI_C "  (iconv_to_ucs_ces_handlers_t *)NULL}\n";
   print CESBI_C "};\n\n";
 
   print CESBI_C "/*\n";
   print CESBI_C " * The following structure contains the list of \"from UCS\" linked-in CES converters.\n";
   print CESBI_C " */\n";
-  print CESBI_C "_CONST iconv_from_ucs_ces_t\n";
+  print CESBI_C "const iconv_from_ucs_ces_t\n";
   print CESBI_C "_iconv_from_ucs_ces[] =\n";
   print CESBI_C "{\n";
   
   foreach my $ces (@ces)
   {
     print CESBI_C "#ifdef $macro_from_ucs_ces\U$ces\n";
-    print CESBI_C "  {(_CONST char **)$var_ces_names$ces,\n";
+    print CESBI_C "  {(const char **)$var_ces_names$ces,\n";
     print CESBI_C "   &$var_from_ucs_handlers$ces},\n";
     print CESBI_C "#endif\n";
   }
-  print CESBI_C "  {(_CONST char **)NULL,\n";
+  print CESBI_C "  {(const char **)NULL,\n";
   print CESBI_C "  (iconv_from_ucs_ces_handlers_t *)NULL}\n";
   print CESBI_C "};\n";
 
@@ -866,7 +866,7 @@ sub generate_ccsbi_c($)
   print CESBI_C " * The following array contains the list of built-in CCS tables.\n";
   print CESBI_C " */\n";
 
-  print CESBI_C "_CONST iconv_ccs_t *\n";
+  print CESBI_C "const iconv_ccs_t *\n";
   print CESBI_C "_iconv_ccs[] =\n";
   print CESBI_C "{\n";
 
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 650bf9af2..1bab90986 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -67,7 +67,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static _VOID_PTR
 _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
                                 struct _reent *rptr,
-                                _CONST char *encoding)
+                                const char *encoding)
 {
   return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
 }
@@ -93,7 +93,7 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
 static ucs4_t
 _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
                              _VOID_PTR data,
-                             _CONST unsigned char **inbuf,
+                             const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   if (*inbytesleft < 1)
@@ -115,7 +115,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
 static _VOID_PTR
 _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
                               struct _reent *rptr,
-                              _CONST char *encoding)
+                              const char *encoding)
 {
   return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
 }
@@ -138,7 +138,7 @@ _DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
 #endif /* ICONV_TO_UCS_CES_TABLE_PCS */
 
 #if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_table_pcs =
 {
   table_pcs_from_ucs_init,
@@ -152,7 +152,7 @@ _iconv_from_ucs_ces_handlers_table_pcs =
 #endif
 
 #if defined (ICONV_TO_UCS_CES_TABLE_PCS)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_table_pcs =
 {
   table_pcs_to_ucs_init,
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 39c358cda..c02831a5b 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -57,17 +57,17 @@
  */
 
 static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, _CONST __uint16_t *tblp));
+_EXFUN(find_code_size, (ucs2_t code, const __uint16_t *tblp));
 
 static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, _CONST __uint16_t *tblp));
+_EXFUN(find_code_speed, (ucs2_t code, const __uint16_t *tblp));
 
 static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, _CONST unsigned char *tblp));
+_EXFUN(find_code_speed_8bit, (ucs2_t code, const unsigned char *tblp));
 
 #ifdef _ICONV_ENABLE_EXTERNAL_CCS
-static _CONST iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
+static const iconv_ccs_desc_t *
+_EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
 #endif
 
 /*
@@ -78,7 +78,7 @@ _DEFUN(table_close, (rptr, data),
                     struct _reent *rptr,
                     _VOID_PTR data)
 {
-  _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+  const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
 
   if (ccsp->type == TABLE_EXTERNAL)
     _free_r (rptr, (_VOID_PTR)ccsp->tbl);
@@ -91,10 +91,10 @@ _DEFUN(table_close, (rptr, data),
 static _VOID_PTR
 _DEFUN(table_init_from_ucs, (rptr, encoding),
                             struct _reent *rptr,
-                            _CONST char *encoding)
+                            const char *encoding)
 {
   int i;
-  _CONST iconv_ccs_t *biccsp = NULL;
+  const iconv_ccs_t *biccsp = NULL;
   iconv_ccs_desc_t *ccsp;
   
   for (i = 0; _iconv_ccs[i] != NULL; i++)
@@ -133,7 +133,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
                                unsigned char **outbuf,
                                size_t *outbytesleft)
 {
-  _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+  const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
   ucs2_t code;
 
   if (in > 0xFFFF || in == INVALC)
@@ -142,7 +142,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
   if (ccsp->bits == TABLE_8BIT)
     {
       code = find_code_speed_8bit ((ucs2_t)in,
-                                  (_CONST unsigned char *)ccsp->tbl);
+                                  (const unsigned char *)ccsp->tbl);
       if (code == INVALC)
         return (size_t)ICONV_CES_INVALID_CHARACTER;
       **outbuf = (unsigned char)code;
@@ -174,10 +174,10 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static _VOID_PTR
 _DEFUN(table_init_to_ucs, (rptr, encoding),
                           struct _reent *rptr,
-                          _CONST char *encoding)
+                          const char *encoding)
 {
   int i;
-  _CONST iconv_ccs_t *biccsp = NULL;
+  const iconv_ccs_t *biccsp = NULL;
   iconv_ccs_desc_t *ccsp;
   
   for (i = 0; _iconv_ccs[i] != NULL; i++)
@@ -212,10 +212,10 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
 static ucs4_t
 _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
                              _VOID_PTR data,
-                             _CONST unsigned char **inbuf,
+                             const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
-  _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+  const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
   ucs2_t ucs;
   
   if (ccsp->bits == TABLE_8BIT)
@@ -261,7 +261,7 @@ _DEFUN(table_get_mb_cur_max, (data),
 
 
 #if defined (ICONV_TO_UCS_CES_TABLE)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_table =
 {
   table_init_to_ucs,
@@ -275,7 +275,7 @@ _iconv_to_ucs_ces_handlers_table =
 #endif /* ICONV_FROM_UCS_CES_TABLE */
 
 #if defined (ICONV_FROM_UCS_CES_TABLE)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_table =
 {
   table_init_from_ucs,
@@ -297,7 +297,7 @@ _iconv_from_ucs_ces_handlers_table =
  *
  * PARAMETERS:
  *     ucs2_t code - code whose mapping to find.
- *     _CONST __uint16_t *tblp - table pointer.
+ *     const __uint16_t *tblp - table pointer.
  *
  * RETURN:
  *     Code that corresponds to 'code'.
@@ -305,7 +305,7 @@ _iconv_from_ucs_ces_handlers_table =
 static __inline ucs2_t
 _DEFUN(find_code_speed, (code, tblp),
                         ucs2_t code,
-                        _CONST __uint16_t *tblp)
+                        const __uint16_t *tblp)
 {
   int idx = tblp[code >> 8];
 
@@ -320,7 +320,7 @@ _DEFUN(find_code_speed, (code, tblp),
  *
  * PARAMETERS:
  *     ucs2_t code - code whose mapping to find.
- *     _CONST __uint16_t *tblp - table pointer.
+ *     const __uint16_t *tblp - table pointer.
  *
  * RETURN:
  *     Code that corresponds to 'code'.
@@ -328,7 +328,7 @@ _DEFUN(find_code_speed, (code, tblp),
 static __inline ucs2_t
 _DEFUN(find_code_speed_8bit, (code, tblp),
                              ucs2_t code,
-                             _CONST unsigned char *tblp)
+                             const unsigned char *tblp)
 {
   int idx;
   unsigned char ccs;
@@ -360,7 +360,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
  *
  * PARAMETERS:
  *     ucs2_t code - code whose mapping to find.
- *     _CONST __uint16_t *tblp - table pointer.
+ *     const __uint16_t *tblp - table pointer.
  *
  * RETURN:
  *     Code that corresponds to 'code'.
@@ -368,7 +368,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
 static ucs2_t
 _DEFUN(find_code_size, (code, tblp),
                        ucs2_t code,
-                       _CONST __uint16_t *tblp)
+                       const __uint16_t *tblp)
 {
   int first, last, cur, center;
 
@@ -447,7 +447,7 @@ _DEFUN(find_code_size, (code, tblp),
  *
  * PARAMETERS:
  *    struct _reent *rptr - reent structure of current thread/process.
- *    _CONST char *name - encoding name.
+ *    const char *name - encoding name.
  *    int direction - conversion direction.
  *
  * DESCRIPTION:
@@ -459,17 +459,17 @@ _DEFUN(find_code_size, (code, tblp),
  * RETURN:
  *    iconv_ccs_desc_t * pointer is success, NULL if failure.
  */
-static _CONST iconv_ccs_desc_t *
+static const iconv_ccs_desc_t *
 _DEFUN(load_file, (rptr, name, direction),
                   struct _reent *rptr,
-                  _CONST char *name,
+                  const char *name,
                   int direction)
 {
   int fd;
-  _CONST unsigned char *buf;
+  const unsigned char *buf;
   int tbllen, hdrlen;
   off_t off;
-  _CONST char *fname;
+  const char *fname;
   iconv_ccs_desc_t *ccsp = NULL;
   int nmlen = strlen(name);
   /* Since CCS table name length can vary - it is aligned (by adding extra
@@ -487,7 +487,7 @@ _DEFUN(load_file, (rptr, name, direction),
   if ((fd = _open_r (rptr, fname, O_RDONLY, S_IRUSR)) == -1)
     goto error1;
   
-  if ((buf = (_CONST unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
+  if ((buf = (const unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
     goto error2;
 
   if (_read_r (rptr, fd, (_VOID_PTR)buf, hdrlen) != hdrlen)
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 2aacce912..7aed01e88 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -68,7 +68,7 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static ucs4_t
 _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
                                       _VOID_PTR data,
-                                      _CONST unsigned char **inbuf,
+                                      const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
   register ucs4_t res;
@@ -96,7 +96,7 @@ _DEFUN(ucs_2_internal_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_2_internal =
 {
   NULL,
@@ -110,7 +110,7 @@ _iconv_to_ucs_ces_handlers_ucs_2_internal =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_2_internal =
 {
   NULL,
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 000a7912f..7d03ee890 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -52,7 +52,7 @@
 static _VOID_PTR
 _DEFUN(ucs_2_init, (rptr, encoding),
                    struct _reent *rptr,
-                   _CONST char *encoding)
+                   const char *encoding)
 {
   int *data;
   
@@ -107,7 +107,7 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static ucs4_t
 _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
                              _VOID_PTR data,
-                             _CONST unsigned char **inbuf,
+                             const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   ucs4_t res;
@@ -139,7 +139,7 @@ _DEFUN(ucs_2_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_UCS_2)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_2 =
 {
   ucs_2_init,
@@ -153,7 +153,7 @@ _iconv_to_ucs_ces_handlers_ucs_2 =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_UCS_2)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_2 =
 {
   ucs_2_init,
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index 4266b2afc..1df5f3fc6 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -68,7 +68,7 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static ucs4_t
 _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
                                       _VOID_PTR data,
-                                      _CONST unsigned char **inbuf,
+                                      const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
   register ucs4_t res;
@@ -96,7 +96,7 @@ _DEFUN(ucs_4_internal_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_4_internal =
 {
   NULL,
@@ -110,7 +110,7 @@ _iconv_to_ucs_ces_handlers_ucs_4_internal =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_4_internal =
 {
   NULL,
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 1d028c5dd..8fbfa6aa1 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -53,7 +53,7 @@
 static _VOID_PTR
 _DEFUN(ucs_4_init, (rptr, encoding),
                    struct _reent *rptr,
-                   _CONST char *encoding)
+                   const char *encoding)
 {
   int *data;
   
@@ -109,7 +109,7 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static ucs4_t
 _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
                              _VOID_PTR data,
-                             _CONST unsigned char **inbuf,
+                             const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   ucs4_t res;
@@ -141,7 +141,7 @@ _DEFUN(ucs_4_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_UCS_4)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_ucs_4 =
 {
   ucs_4_init,
@@ -155,7 +155,7 @@ _iconv_to_ucs_ces_handlers_ucs_4 =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_UCS_4)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_ucs_4 =
 {
   ucs_4_init,
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index eb4dee6e3..1fc7c5d89 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -62,7 +62,7 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static ucs4_t
 _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
                                 _VOID_PTR data,
-                                _CONST unsigned char **inbuf,
+                                const unsigned char **inbuf,
                                 size_t *inbytesleft)
 {
   ucs4_t res;
@@ -90,7 +90,7 @@ _DEFUN(us_ascii_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_US_ASCII)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_us_ascii =
 {
   NULL,
@@ -104,7 +104,7 @@ _iconv_to_ucs_ces_handlers_us_ascii =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_US_ASCII)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_us_ascii =
 {
   NULL,
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index 93cc4c341..fee97b0ee 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -70,7 +70,7 @@ _DEFUN(utf_16_close, (rptr, data),
 static _VOID_PTR
 _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
                              struct _reent *rptr,
-                             _CONST char *encoding)
+                             const char *encoding)
 {
   int *data;
   
@@ -172,7 +172,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
 static _VOID_PTR
 _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
                            struct _reent *rptr,
-                           _CONST char *encoding)
+                           const char *encoding)
 {
   int *data;
   
@@ -192,7 +192,7 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
 static ucs4_t
 _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
                               _VOID_PTR data,
-                              _CONST unsigned char **inbuf,
+                              const unsigned char **inbuf,
                               size_t *inbytesleft)
 {
   register ucs2_t w1;
@@ -275,7 +275,7 @@ _DEFUN(utf_16_get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_UTF_16)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_utf_16 =
 {
   utf_16_init_to_ucs,
@@ -289,7 +289,7 @@ _iconv_to_ucs_ces_handlers_utf_16 =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_UTF_16)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_utf_16 =
 {
   utf_16_init_from_ucs,
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index f02dd6fcc..ae778d12d 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -127,10 +127,10 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
 static ucs4_t
 _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
                        _VOID_PTR data,
-                       _CONST unsigned char **inbuf,
+                       const unsigned char **inbuf,
                        size_t *inbytesleft)
 {
-  register _CONST unsigned char *in = *inbuf;
+  register const unsigned char *in = *inbuf;
   register size_t bytes;
   ucs4_t res;
 
@@ -266,7 +266,7 @@ _DEFUN(get_mb_cur_max, (data),
 }
 
 #if defined (ICONV_TO_UCS_CES_UTF_8)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
 _iconv_to_ucs_ces_handlers_utf_8 =
 {
   NULL,
@@ -280,7 +280,7 @@ _iconv_to_ucs_ces_handlers_utf_8 =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_UTF_8)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
 _iconv_from_ucs_ces_handlers_utf_8 =
 {
   NULL,
diff --git a/newlib/libc/iconv/lib/aliasesbi.c b/newlib/libc/iconv/lib/aliasesbi.c
index 36c434e16..dfd7090d0 100644
--- a/newlib/libc/iconv/lib/aliasesbi.c
+++ b/newlib/libc/iconv/lib/aliasesbi.c
@@ -5,7 +5,7 @@
 #include <_ansi.h>
 #include "encnames.h"
 
-_CONST char *
+const char *
 _iconv_aliases =
 {
 #if defined (_ICONV_FROM_ENCODING_BIG5) \
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 278b84915..1f4f70ffc 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -38,7 +38,7 @@
  *
  * PARAMETERS:
  *   struct _reent *rptr - reent structure of current thread/process.
- *   _CONST char *str    - string to canonize.
+ *   const char *str    - string to canonize.
  *
  * DESCRIPTION:
  *   Converts all letters to small and substitute all '-' characters by '_'
@@ -47,15 +47,15 @@
  * RETURN:
  *   Returns canonical form of 'str' if success, NULL if failure.
  */
-static _CONST char *
+static const char *
 _DEFUN(canonical_form, (rptr, str),
                        struct _reent *rptr,
-                       _CONST char *str)
+                       const char *str)
 {
   char *p, *p1;
 
   if (str == NULL || (p = p1 = _strdup_r (rptr, str)) == NULL)
-    return (_CONST char *)NULL;
+    return (const char *)NULL;
 
   for (; *str; str++, p++)
     {
@@ -65,7 +65,7 @@ _DEFUN(canonical_form, (rptr, str),
         *p = tolower (*str);
     }
 
-  return (_CONST char *)p1;
+  return (const char *)p1;
 }
 
 /*
@@ -73,8 +73,8 @@ _DEFUN(canonical_form, (rptr, str),
  *
  * PARAMETERS:
  *   struct _reent *rptr - reent structure of current thread/process.
- *   _CONST char *alias  - alias by which "official" name should be found.
- *   _CONST char *table  - aliases table.
+ *   const char *alias  - alias by which "official" name should be found.
+ *   const char *table  - aliases table.
  *   int len             - aliases table length.
  *
  * DESCRIPTION:
@@ -95,15 +95,15 @@ _DEFUN(canonical_form, (rptr, str),
 static char *
 _DEFUN(find_alias, (rptr, alias, table, len),
                    struct _reent *rptr,
-                   _CONST char *alias,
-                   _CONST char *table,
+                   const char *alias,
+                   const char *table,
                    int len)
 {
-  _CONST char *end;
-  _CONST char *p;
+  const char *end;
+  const char *p;
   int l = strlen (alias);
-  _CONST char *ptable = table;
-  _CONST char *table_end = table + len;
+  const char *ptable = table;
+  const char *table_end = table + len;
 
   if (table == NULL || alias == NULL || *table == '\0' || *alias == '\0')
     return NULL;
@@ -136,7 +136,7 @@ search_again:
  *
  * PARAMETERS:
  *   struct _reent *rptr - reent structure of current thread/process.
- *   _CONST char *ca     - encoding alias to resolve.
+ *   const char *ca     - encoding alias to resolve.
  *
  * DESCRIPTION:
  *   First, tries to find 'ca' among built-in aliases. If not found, tries to
@@ -149,7 +149,7 @@ search_again:
 char *
 _DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
                                      struct _reent *rptr,
-                                     _CONST char *ca)
+                                     const char *ca)
 {
   char *p = (char *)ca;
 
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index 550f44949..f0088767e 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -52,8 +52,8 @@ typedef struct
    *
    * PARAMETERS:
    *   struct _reent *rptr - reent structure of current thread/process;
-   *   _CONST char *to     - output encoding's normalized name;
-   *   _CONST char *from   - input encoding's normalized name.
+   *   const char *to     - output encoding's normalized name;
+   *   const char *from   - input encoding's normalized name.
    *
    * DESCRIPTION:
    *   This function is called from iconv_open() to open conversion. Returns
@@ -64,8 +64,8 @@ typedef struct
    *   returns NULL and sets current thread's/process's errno.
    */
   _VOID_PTR _EXFNPTR(open, (struct _reent *rptr,
-                          _CONST char *to,
-                          _CONST char *from));
+                          const char *to,
+                          const char *from));
   
   /*
    * close - close conversion.
@@ -89,7 +89,7 @@ typedef struct
    * PARAMETERS:
    *   struct _reent *rptr - reent structure of current thread/process.
    *   _VOID_PTR data      - conversion-specific data;
-   *   _CONST unsigned char **inbuf - input data buffer;
+   *   const unsigned char **inbuf - input data buffer;
    *   size_t *inbytesleft          - input buffer's length;
    *   unsigned char **outbuf       - output data buffer;
    *   size_t *outbytesleft         - output buffer free space;
@@ -116,7 +116,7 @@ typedef struct
    */
   size_t _EXFNPTR(convert, (struct _reent *rptr,
                            _VOID_PTR data,
-                           _CONST unsigned char **inbuf,
+                           const unsigned char **inbuf,
                            size_t *inbytesleft,
                            unsigned char **outbuf,
                            size_t *outbytesleft,
@@ -199,7 +199,7 @@ typedef struct
 typedef struct
 {
   /* Iconv conversion handlers. */
-  _CONST iconv_conversion_handlers_t *handlers;
+  const iconv_conversion_handlers_t *handlers;
   
   /*
    * Conversion-specific data (e.g., points to iconv_ucs_conversion_t
@@ -210,11 +210,11 @@ typedef struct
 
 
 /* UCS-based conversion handlers */
-extern _CONST iconv_conversion_handlers_t
+extern const iconv_conversion_handlers_t
 _iconv_ucs_conversion_handlers;
 
 /* Null conversion handlers */
-extern _CONST iconv_conversion_handlers_t
+extern const iconv_conversion_handlers_t
 _iconv_null_conversion_handlers;
 
 #endif /* !__ICONV_CONVERSION_H__ */
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index b8000e4be..7c9b252f3 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -121,8 +121,8 @@ No supporting OS subroutine calls are required.
 
 iconv_t
 _DEFUN(iconv_open, (to, from),
-                   _CONST char *to,
-                   _CONST char *from)
+                   const char *to,
+                   const char *from)
 {
   return _iconv_open_r (_REENT, to, from);
 }
@@ -136,7 +136,7 @@ _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
               char **__restrict outbuf,
               size_t *__restrict outbytesleft)
 {
-    return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
+    return _iconv_r (_REENT, cd, (const char **) inbuf, inbytesleft,
      outbuf, outbytesleft);
 }
 
@@ -152,18 +152,18 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
 iconv_t
 _DEFUN(_iconv_open_r, (rptr, to, from),
                       struct _reent *rptr,
-                      _CONST char *to,
-                      _CONST char *from)
+                      const char *to,
+                      const char *from)
 {
   iconv_conversion_t *ic;
     
   if (to == NULL || from == NULL || *to == '\0' || *from == '\0')
     return (iconv_t)-1;
 
-  if ((to = (_CONST char *)_iconv_resolve_encoding_name (rptr, to)) == NULL)
+  if ((to = (const char *)_iconv_resolve_encoding_name (rptr, to)) == NULL)
     return (iconv_t)-1;
 
-  if ((from = (_CONST char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
+  if ((from = (const char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
     {
       _free_r (rptr, (_VOID_PTR)to);
       return (iconv_t)-1;
@@ -204,7 +204,7 @@ size_t
 _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
                  struct _reent *rptr,
                  iconv_t cd,
-                 _CONST char **inbuf,
+                 const char **inbuf,
                  size_t *inbytesleft,
                  char **outbuf,
                  size_t *outbytesleft)
@@ -279,7 +279,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
   return ic->handlers->convert (rptr,
                                 ic->data,
-                                (_CONST unsigned char**)inbuf,
+                                (const unsigned char**)inbuf,
                                 inbytesleft,
                                 (unsigned char**)outbuf,
                                 outbytesleft,
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index 3223e1303..fa35cca1a 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -46,9 +46,9 @@
  *
  * PARAMETERS:
  *   struct _reent *rptr - reent structure of current thread/process.  
- *   _CONST char *file   - the name of file.
- *   _CONST char *dir    - the name of subdirectory;
- *   _CONST char *ext    - file extension.
+ *   const char *file   - the name of file.
+ *   const char *dir    - the name of subdirectory;
+ *   const char *ext    - file extension.
  *
  * DESCRIPTION:
  *   Function constructs patch to icionv-related file.
@@ -58,12 +58,12 @@
  *   The pointer to file name if success, In case of error returns NULL
  *   and sets current thread's/process's errno.
  */
-_CONST char *
+const char *
 _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
                                       struct _reent *rptr,
-                                      _CONST char *file,
-                                      _CONST char *dir,
-                                      _CONST char *ext)
+                                      const char *file,
+                                      const char *dir,
+                                      const char *ext)
 {
   int len1, len2, len3;
   char *path;
@@ -78,7 +78,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
   len3 = strlen (ext);
 
   if ((p = _malloc_r (rptr, len1 + dirlen + len2 + len3 + 3)) == NULL)
-    return (_CONST char *)NULL;
+    return (const char *)NULL;
 
   memcpy (p, path, len1);
   if (p[len1 - 1] != '/')
@@ -95,7 +95,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
   }
   p[len1] = '\0';
 
-  return (_CONST char *)p;
+  return (const char *)p;
 }
 
 
@@ -169,7 +169,7 @@ size_t
 _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
                         struct _reent *rptr,
                         iconv_t cd,
-                        _CONST char **inbuf,
+                        const char **inbuf,
                         size_t *inbytesleft,
                         char **outbuf,
                         size_t *outbytesleft)
@@ -199,7 +199,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
   return ic->handlers->convert (rptr,
                                 ic->data,
-                                (_CONST unsigned char**)inbuf,
+                                (const unsigned char**)inbuf,
                                 inbytesleft,
                                 (unsigned char**)outbuf,
                                 outbytesleft,
@@ -261,8 +261,8 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
 static iconv_t
 _DEFUN(iconv_open1, (rptr, to, from),
                      struct _reent *rptr,
-                     _CONST char *to,
-                     _CONST char *from)
+                     const char *to,
+                     const char *from)
 {
   iconv_conversion_t *ic;
     
@@ -301,7 +301,7 @@ _DEFUN(iconv_open1, (rptr, to, from),
  *
  * PARAMETERS:
  *     struct _reent *rptr - process's reent structure;
- *     _CONST char *encoding - encoding name;
+ *     const char *encoding - encoding name;
  *     iconv_t *tomb - wchar -> encoding iconv descriptor pointer;
  *     iconv_t *towc - encoding -> wchar iconv descriptor pointer;
  *     int flag - perform encoding name resolving flag.
@@ -318,12 +318,12 @@ _DEFUN(iconv_open1, (rptr, to, from),
 int
 _DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
                         struct _reent *rptr,
-                        _CONST char *encoding,
+                        const char *encoding,
                         iconv_t *tomb,
                         iconv_t *towc,
                         int flag)
 {
-  _CONST char *wchar_encoding;
+  const char *wchar_encoding;
 
   if (sizeof (wchar_t) > 2 && WCHAR_MAX > 0xFFFF)
     wchar_encoding = "ucs_4_internal";
diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h
index fd386c5fb..46428ae17 100644
--- a/newlib/libc/iconv/lib/local.h
+++ b/newlib/libc/iconv/lib/local.h
@@ -62,7 +62,7 @@ typedef __uint32_t ucs4_t;
 
 
 /* The list of built-in encoding names and aliases */
-extern _CONST char *
+extern const char *
 _iconv_aliases;
 
 #endif /* !__ICONV_LIB_LOCAL_H__ */
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 7ddbc77bd..729007ab0 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -38,8 +38,8 @@ static int null_conversion_dummy_data;
 static _VOID_PTR
 _DEFUN(null_conversion_open, (rptr, to, from),
                              struct _reent *rptr,
-                             _CONST char *to,
-                             _CONST char *from)
+                             const char *to,
+                             const char *from)
 {
   return (_VOID_PTR)&null_conversion_dummy_data;
 }
@@ -59,7 +59,7 @@ _DEFUN(null_conversion_convert,
                      (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
                      struct _reent *rptr,
                      _VOID_PTR data,
-                     _CONST unsigned char **inbuf,
+                     const unsigned char **inbuf,
                      size_t *inbytesleft,
                      unsigned char **outbuf,
                      size_t *outbytesleft,
@@ -129,7 +129,7 @@ _DEFUN(null_conversion_is_stateful, (data, direction),
 }
 
 /* Null conversion definition object */
-_CONST iconv_conversion_handlers_t
+const iconv_conversion_handlers_t
 _iconv_null_conversion_handlers =
 {
   null_conversion_open,
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 46ad33efe..7cc65c86c 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -36,8 +36,8 @@
 static int fake_data;
 
 static int
-_EXFUN(find_encoding_name, (_CONST char *searchee,
-                            _CONST char **names));
+_EXFUN(find_encoding_name, (const char *searchee,
+                            const char **names));
 
 
 /*
@@ -47,12 +47,12 @@ _EXFUN(find_encoding_name, (_CONST char *searchee,
 static _VOID_PTR
 _DEFUN(ucs_based_conversion_open, (rptr, to, from),
                                   struct _reent *rptr,
-                                  _CONST char *to,
-                                  _CONST char *from)
+                                  const char *to,
+                                  const char *from)
 {
   iconv_ucs_conversion_t *uc;
-  _CONST iconv_to_ucs_ces_t   *to_ucs_bices;
-  _CONST iconv_from_ucs_ces_t *from_ucs_bices;
+  const iconv_to_ucs_ces_t   *to_ucs_bices;
+  const iconv_from_ucs_ces_t *from_ucs_bices;
   
   uc = (iconv_ucs_conversion_t *)
              _calloc_r (rptr, 1, sizeof (iconv_ucs_conversion_t));
@@ -148,7 +148,7 @@ _DEFUN(ucs_based_conversion_convert,
                  (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
                  struct _reent *rptr,
                  _VOID_PTR data,
-                 _CONST unsigned char **inbuf,
+                 const unsigned char **inbuf,
                  size_t *inbytesleft,
                  unsigned char **outbuf,
                  size_t *outbytesleft,
@@ -163,7 +163,7 @@ _DEFUN(ucs_based_conversion_convert,
     {
       register size_t bytes;
       register ucs4_t ch;
-      _CONST unsigned char *inbuf_save = *inbuf;
+      const unsigned char *inbuf_save = *inbuf;
       size_t inbyteslef_save = *inbytesleft;
 
       if (*outbytesleft == 0)
@@ -324,7 +324,7 @@ _DEFUN(ucs_based_conversion_is_stateful, (data, direction),
 
 
 /* UCS-based conversion definition object */
-_CONST iconv_conversion_handlers_t
+const iconv_conversion_handlers_t
 _iconv_ucs_conversion_handlers =
 {
   ucs_based_conversion_open,
@@ -343,10 +343,10 @@ _iconv_ucs_conversion_handlers =
 
 static int
 _DEFUN(find_encoding_name, (searchee, names),
-                           _CONST char *searchee,
-                           _CONST char **names)
+                           const char *searchee,
+                           const char **names)
 {
-  _CONST char *p;
+  const char *p;
 
   for (p = *names; p != NULL; p = *(names++))
     if (strcmp (p, searchee) == 0)
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index 4bf7174bf..cea6d5aa3 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -57,7 +57,7 @@ typedef struct
    *
    * PARAMETERS:
    *   struct _reent *rptr   - reent structure of current thread/process;
-   *   _CONST char *encoding - encoding name.
+   *   const char *encoding - encoding name.
    *
    * DESCRIPTION:
    *  Initializes CES converter. CES converter may deal with a series of
@@ -69,7 +69,7 @@ typedef struct
    *   NULL and sets current thread's/process's errno.
    */
   _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
-                          _CONST char *encoding));
+                          const char *encoding));
 
   /*
    * close - close CES converter.
@@ -142,7 +142,7 @@ typedef struct
    *
    * PARAMETERS:
    *   _VOID_PTR data               - CES converter-specific data;
-   *   _CONST unsigned char **inbuf - buffer with input character byte sequence;
+   *   const unsigned char **inbuf - buffer with input character byte sequence;
    *   size_t *inbytesleft          - output buffer bytes count.
    *
    * DESCRIPTION:
@@ -156,7 +156,7 @@ typedef struct
    *   sequence was met, returns ICONV_CES_BAD_SEQUENCE.
    */
   ucs4_t _EXFNPTR(convert_to_ucs, (_VOID_PTR data,
-                                 _CONST unsigned char **inbuf,
+                                 const unsigned char **inbuf,
                                  size_t *inbytesleft));
 } iconv_to_ucs_ces_handlers_t;
 
@@ -173,7 +173,7 @@ typedef struct
 {
   /* Same as in iconv_to_ucs_ces_handlers_t */
   _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
-                          _CONST char *encoding));
+                          const char *encoding));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
   size_t _EXFNPTR(close, (struct _reent *rptr,
@@ -231,7 +231,7 @@ typedef struct
 typedef struct
 {
   /* CES converter handlers */
-  _CONST iconv_to_ucs_ces_handlers_t *handlers;
+  const iconv_to_ucs_ces_handlers_t *handlers;
   
   /* "to_ucs" CES converter-specific data. */
   _VOID_PTR data;
@@ -247,7 +247,7 @@ typedef struct
 typedef struct
 {
   /* CES converter handlers */
-  _CONST iconv_from_ucs_ces_handlers_t *handlers;
+  const iconv_from_ucs_ces_handlers_t *handlers;
   
   /* "from_ucs" CES converter-specific data. */
   _VOID_PTR data;
@@ -290,10 +290,10 @@ typedef struct
    * An array of encodings names, supported by CES converter.
    * The end of array should be marked by NULL pointer.
    */
-  _CONST char **names;
+  const char **names;
 
   /* CES converter description structure */
-  _CONST iconv_to_ucs_ces_handlers_t *handlers;
+  const iconv_to_ucs_ces_handlers_t *handlers;
 } iconv_to_ucs_ces_t;
 
 
@@ -308,19 +308,19 @@ typedef struct
    * An array of encodings names, supported by CES converter.
    * The end of array should be marked by NULL pointer.
    */
-  _CONST char **names;
+  const char **names;
 
   /* CES converter description structure */
-  _CONST iconv_from_ucs_ces_handlers_t *handlers;
+  const iconv_from_ucs_ces_handlers_t *handlers;
 } iconv_from_ucs_ces_t;
 
 
 /* List of "to UCS" linked-in CES converters. */
-extern _CONST iconv_to_ucs_ces_t
+extern const iconv_to_ucs_ces_t
 _iconv_to_ucs_ces[];
 
 /* List of "from UCS" linked-in CES converters. */
-extern _CONST iconv_from_ucs_ces_t
+extern const iconv_from_ucs_ces_t
 _iconv_from_ucs_ces[];
 
 #endif /* !__ICONV_UCS_CONVERSION_H__ */
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index fc832fc40..b0ce3bd4e 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -49,7 +49,6 @@
 #ifdef _HAVE_STDC
 #define _PTR void *
 #define _NOARGS void
-#define _CONST const
 #define _VOLATILE volatile
 #define _SIGNED signed
 #define _DOTS , ...
@@ -77,7 +76,6 @@
 #else
 #define _PTR char *
 #define _NOARGS
-#define _CONST
 #define _VOLATILE
 #define _SIGNED
 #define _DOTS
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 06458cbda..0d705e131 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -162,7 +162,7 @@ const char *__locale_ctype_ptr_l (locale_t);
 #endif /* !__cplusplus */
 
 /* For C++ backward-compatibility only.  */
-extern __IMPORT _CONST char _ctype_[];
+extern __IMPORT const char _ctype_[];
 
 _END_STD_C
 
diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
index 4c023e9df..e19f73d85 100644
--- a/newlib/libc/include/iconv.h
+++ b/newlib/libc/include/iconv.h
@@ -38,7 +38,7 @@ _BEGIN_STD_C
 
 #ifndef _REENT_ONLY
 iconv_t
-_EXFUN(iconv_open, (_CONST char *, _CONST char *));
+_EXFUN(iconv_open, (const char *, const char *));
 
 size_t
 _EXFUN(iconv, (iconv_t, char **__restrict, size_t *__restrict,
@@ -49,10 +49,10 @@ _EXFUN(iconv_close, (iconv_t));
 #endif
 
 iconv_t
-_EXFUN(_iconv_open_r, (struct _reent *, _CONST char *, _CONST char *));
+_EXFUN(_iconv_open_r, (struct _reent *, const char *, const char *));
 
 size_t
-_EXFUN(_iconv_r, (struct _reent *, iconv_t, _CONST char **,
+_EXFUN(_iconv_r, (struct _reent *, iconv_t, const char **,
                   size_t *, char **, size_t *));
 
 int
diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index fb2fa93d8..493eafd7e 100644
--- a/newlib/libc/include/pthread.h
+++ b/newlib/libc/include/pthread.h
@@ -47,7 +47,7 @@ int _EXFUN(pthread_atfork,(void (*prepare)(void), void (*parent)(void),
 int _EXFUN(pthread_mutexattr_init, (pthread_mutexattr_t *__attr));
 int _EXFUN(pthread_mutexattr_destroy, (pthread_mutexattr_t *__attr));
 int _EXFUN(pthread_mutexattr_getpshared,
- (_CONST pthread_mutexattr_t *__attr, int  *__pshared));
+ (const pthread_mutexattr_t *__attr, int  *__pshared));
 int _EXFUN(pthread_mutexattr_setpshared,
  (pthread_mutexattr_t *__attr, int __pshared));
 
@@ -56,7 +56,7 @@ int _EXFUN(pthread_mutexattr_setpshared,
 /* Single UNIX Specification 2 Mutex Attributes types */
 
 int _EXFUN(pthread_mutexattr_gettype,
- (_CONST pthread_mutexattr_t *__attr, int *__kind));
+ (const pthread_mutexattr_t *__attr, int *__kind));
 int _EXFUN(pthread_mutexattr_settype,
  (pthread_mutexattr_t *__attr, int __kind));
 
@@ -65,7 +65,7 @@ int _EXFUN(pthread_mutexattr_settype,
 /* Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87 */
 
 int _EXFUN(pthread_mutex_init,
- (pthread_mutex_t *__mutex, _CONST pthread_mutexattr_t *__attr));
+ (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr));
 int _EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
 
 /* This is used to statically initialize a pthread_mutex_t. Example:
@@ -85,7 +85,7 @@ int _EXFUN(pthread_mutex_unlock, (pthread_mutex_t *__mutex));
 #if defined(_POSIX_TIMEOUTS)
 
 int _EXFUN(pthread_mutex_timedlock,
- (pthread_mutex_t *__mutex, _CONST struct timespec *__timeout));
+ (pthread_mutex_t *__mutex, const struct timespec *__timeout));
 
 #endif /* _POSIX_TIMEOUTS */
 
@@ -101,14 +101,14 @@ int _EXFUN(pthread_condattr_setclock,
  (pthread_condattr_t *__attr, clockid_t __clock_id));
 
 int _EXFUN(pthread_condattr_getpshared,
- (_CONST pthread_condattr_t *__attr, int *__pshared));
+ (const pthread_condattr_t *__attr, int *__pshared));
 int _EXFUN(pthread_condattr_setpshared,
  (pthread_condattr_t *__attr, int __pshared));
 
 /* Initializing and Destroying a Condition Variable, P1003.1c/Draft 10, p. 87 */
 
 int _EXFUN(pthread_cond_init,
- (pthread_cond_t *__cond, _CONST pthread_condattr_t *__attr));
+ (pthread_cond_t *__cond, const pthread_condattr_t *__attr));
 int _EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
 
 /* This is used to statically initialize a pthread_cond_t. Example:
@@ -130,7 +130,7 @@ int _EXFUN(pthread_cond_wait,
 
 int _EXFUN(pthread_cond_timedwait,
  (pthread_cond_t *__cond, pthread_mutex_t *__mutex,
- _CONST struct timespec *__abstime));
+ const struct timespec *__abstime));
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 
@@ -139,22 +139,22 @@ int _EXFUN(pthread_cond_timedwait,
 int _EXFUN(pthread_attr_setscope,
  (pthread_attr_t *__attr, int __contentionscope));
 int _EXFUN(pthread_attr_getscope,
- (_CONST pthread_attr_t *__attr, int *__contentionscope));
+ (const pthread_attr_t *__attr, int *__contentionscope));
 int _EXFUN(pthread_attr_setinheritsched,
  (pthread_attr_t *__attr, int __inheritsched));
 int _EXFUN(pthread_attr_getinheritsched,
- (_CONST pthread_attr_t *__attr, int *__inheritsched));
+ (const pthread_attr_t *__attr, int *__inheritsched));
 int _EXFUN(pthread_attr_setschedpolicy,
  (pthread_attr_t *__attr, int __policy));
 int _EXFUN(pthread_attr_getschedpolicy,
- (_CONST pthread_attr_t *__attr, int *__policy));
+ (const pthread_attr_t *__attr, int *__policy));
 
 #endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
 
 int _EXFUN(pthread_attr_setschedparam,
- (pthread_attr_t *__attr, _CONST struct sched_param *__param));
+ (pthread_attr_t *__attr, const struct sched_param *__param));
 int _EXFUN(pthread_attr_getschedparam,
- (_CONST pthread_attr_t *__attr, struct sched_param *__param));
+ (const pthread_attr_t *__attr, struct sched_param *__param));
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 
@@ -183,11 +183,11 @@ int pthread_setname_np(pthread_t, const char *) __nonnull((2));
 int _EXFUN(pthread_mutexattr_setprotocol,
  (pthread_mutexattr_t *__attr, int __protocol));
 int _EXFUN(pthread_mutexattr_getprotocol,
- (_CONST pthread_mutexattr_t *__attr, int *__protocol));
+ (const pthread_mutexattr_t *__attr, int *__protocol));
 int _EXFUN(pthread_mutexattr_setprioceiling,
  (pthread_mutexattr_t *__attr, int __prioceiling));
 int _EXFUN(pthread_mutexattr_getprioceiling,
- (_CONST pthread_mutexattr_t *__attr, int *__prioceiling));
+ (const pthread_mutexattr_t *__attr, int *__prioceiling));
 
 #endif /* _POSIX_THREAD_PRIO_INHERIT || _POSIX_THREAD_PRIO_PROTECT */
 
@@ -208,22 +208,22 @@ int _EXFUN(pthread_attr_init, (pthread_attr_t *__attr));
 int _EXFUN(pthread_attr_destroy, (pthread_attr_t *__attr));
 int _EXFUN(pthread_attr_setstack, (pthread_attr_t *attr,
  void *__stackaddr, size_t __stacksize));
-int _EXFUN(pthread_attr_getstack, (_CONST pthread_attr_t *attr,
+int _EXFUN(pthread_attr_getstack, (const pthread_attr_t *attr,
  void **__stackaddr, size_t *__stacksize));
 int _EXFUN(pthread_attr_getstacksize,
- (_CONST pthread_attr_t *__attr, size_t *__stacksize));
+ (const pthread_attr_t *__attr, size_t *__stacksize));
 int _EXFUN(pthread_attr_setstacksize,
  (pthread_attr_t *__attr, size_t __stacksize));
 int _EXFUN(pthread_attr_getstackaddr,
- (_CONST pthread_attr_t *__attr, void **__stackaddr));
+ (const pthread_attr_t *__attr, void **__stackaddr));
 int _EXFUN(pthread_attr_setstackaddr,
  (pthread_attr_t  *__attr, void *__stackaddr));
 int _EXFUN(pthread_attr_getdetachstate,
- (_CONST pthread_attr_t *__attr, int *__detachstate));
+ (const pthread_attr_t *__attr, int *__detachstate));
 int _EXFUN(pthread_attr_setdetachstate,
  (pthread_attr_t *__attr, int __detachstate));
 int _EXFUN(pthread_attr_getguardsize,
- (_CONST pthread_attr_t *__attr, size_t *__guardsize));
+ (const pthread_attr_t *__attr, size_t *__guardsize));
 int _EXFUN(pthread_attr_setguardsize,
  (pthread_attr_t *__attr, size_t __guardsize));
 
@@ -253,7 +253,7 @@ int _EXFUN(pthread_getattr_np,
 /* Thread Creation, P1003.1c/Draft 10, p. 144 */
 
 int _EXFUN(pthread_create,
- (pthread_t *__pthread, _CONST pthread_attr_t  *__attr,
+ (pthread_t *__pthread, const pthread_attr_t  *__attr,
  void *(*__start_routine)( void * ), void *__arg));
 
 /* Wait for Thread Termination, P1003.1c/Draft 10, p. 147 */
@@ -309,7 +309,7 @@ int _EXFUN(pthread_key_create,
 /* Thread-Specific Data Management, P1003.1c/Draft 10, p. 165 */
 
 int _EXFUN(pthread_setspecific,
- (pthread_key_t __key, _CONST void *__value));
+ (pthread_key_t __key, const void *__value));
 void * _EXFUN(pthread_getspecific, (pthread_key_t __key));
 
 /* Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167 */
@@ -391,7 +391,7 @@ int _EXFUN(pthread_getcpuclockid,
 int _EXFUN(pthread_barrierattr_init, (pthread_barrierattr_t *__attr));
 int _EXFUN(pthread_barrierattr_destroy, (pthread_barrierattr_t *__attr));
 int _EXFUN(pthread_barrierattr_getpshared,
- (_CONST pthread_barrierattr_t *__attr, int *__pshared));
+ (const pthread_barrierattr_t *__attr, int *__pshared));
 int _EXFUN(pthread_barrierattr_setpshared,
  (pthread_barrierattr_t *__attr, int __pshared));
 
@@ -399,7 +399,7 @@ int _EXFUN(pthread_barrierattr_setpshared,
 
 int _EXFUN(pthread_barrier_init,
  (pthread_barrier_t *__barrier,
- _CONST pthread_barrierattr_t *__attr, unsigned __count));
+ const pthread_barrierattr_t *__attr, unsigned __count));
 int _EXFUN(pthread_barrier_destroy, (pthread_barrier_t *__barrier));
 int _EXFUN(pthread_barrier_wait,(pthread_barrier_t *__barrier));
 
@@ -428,22 +428,22 @@ int _EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
 int _EXFUN(pthread_rwlockattr_init, (pthread_rwlockattr_t *__attr));
 int _EXFUN(pthread_rwlockattr_destroy, (pthread_rwlockattr_t *__attr));
 int _EXFUN(pthread_rwlockattr_getpshared,
- (_CONST pthread_rwlockattr_t *__attr, int *__pshared));
+ (const pthread_rwlockattr_t *__attr, int *__pshared));
 int _EXFUN(pthread_rwlockattr_setpshared,
  (pthread_rwlockattr_t *__attr, int __pshared));
 
 int _EXFUN(pthread_rwlock_init,
- (pthread_rwlock_t *__rwlock, _CONST pthread_rwlockattr_t *__attr));
+ (pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr));
 int _EXFUN(pthread_rwlock_destroy, (pthread_rwlock_t *__rwlock));
 int _EXFUN(pthread_rwlock_rdlock,(pthread_rwlock_t *__rwlock));
 int _EXFUN(pthread_rwlock_tryrdlock,(pthread_rwlock_t *__rwlock));
 int _EXFUN(pthread_rwlock_timedrdlock,
-        (pthread_rwlock_t *__rwlock, _CONST struct timespec *__abstime));
+        (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
 int _EXFUN(pthread_rwlock_unlock,(pthread_rwlock_t *__rwlock));
 int _EXFUN(pthread_rwlock_wrlock,(pthread_rwlock_t *__rwlock));
 int _EXFUN(pthread_rwlock_trywrlock,(pthread_rwlock_t *__rwlock));
 int _EXFUN(pthread_rwlock_timedwrlock,
-        (pthread_rwlock_t *__rwlock, _CONST struct timespec *__abstime));
+        (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
 
 #endif /* defined(_POSIX_READER_WRITER_LOCKS) */
 
diff --git a/newlib/libc/include/rpc/xdr.h b/newlib/libc/include/rpc/xdr.h
index 4f93bf38e..40ddc1cdd 100644
--- a/newlib/libc/include/rpc/xdr.h
+++ b/newlib/libc/include/rpc/xdr.h
@@ -108,19 +108,19 @@ enum xdr_op
 typedef struct __rpc_xdr
 {
   enum xdr_op x_op;             /* operation; fast additional param */
-  _CONST struct xdr_ops
+  const struct xdr_ops
   {
     /* get a long from underlying stream */
     bool_t _EXFNPTR (x_getlong, (struct __rpc_xdr *, long *));
 
     /* put a long to " */
-    bool_t _EXFNPTR (x_putlong, (struct __rpc_xdr *, _CONST long *));
+    bool_t _EXFNPTR (x_putlong, (struct __rpc_xdr *, const long *));
 
     /* get some bytes from " */
     bool_t _EXFNPTR (x_getbytes, (struct __rpc_xdr *, char *, u_int));
 
     /* put some bytes to " */
-    bool_t _EXFNPTR (x_putbytes, (struct __rpc_xdr *, _CONST char *, u_int));
+    bool_t _EXFNPTR (x_putbytes, (struct __rpc_xdr *, const char *, u_int));
 
     /* returns bytes off from beginning */
     u_int _EXFNPTR (x_getpostn, (struct __rpc_xdr *));
@@ -138,7 +138,7 @@ typedef struct __rpc_xdr
     bool_t _EXFNPTR (x_getint32, (struct __rpc_xdr *, int32_t *));
 
     /* put an int32 to the underlying stream */
-    bool_t _EXFNPTR (x_putint32, (struct __rpc_xdr *, _CONST int32_t *));
+    bool_t _EXFNPTR (x_putint32, (struct __rpc_xdr *, const int32_t *));
 
   } *x_ops;
   char *x_public;               /* users' data */
@@ -320,7 +320,7 @@ extern bool_t _EXFUN (xdr_bytes, (XDR *, char **, u_int *, u_int));
 extern bool_t _EXFUN (xdr_opaque, (XDR *, char *, u_int));
 extern bool_t _EXFUN (xdr_string, (XDR *, char **, u_int));
 extern bool_t _EXFUN (xdr_union, (XDR *, enum_t *, char *,
-                                  _CONST struct xdr_discrim *, xdrproc_t));
+                                  const struct xdr_discrim *, xdrproc_t));
 extern bool_t _EXFUN (xdr_char, (XDR *, char *));
 extern bool_t _EXFUN (xdr_u_char, (XDR *, u_char *));
 extern bool_t _EXFUN (xdr_vector, (XDR *, char *, u_int, u_int, xdrproc_t));
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index b648e6201..9152bf096 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -552,7 +552,7 @@ int _EXFUN(fputs_unlocked, (const char *__restrict, FILE *__restrict));
 #if !defined(__CYGWIN__) || defined(_COMPILING_NEWLIB)
 FILE * _EXFUN(fdopen64, (int, const char *));
 FILE *  _EXFUN(fopen64, (const char *, const char *));
-FILE *  _EXFUN(freopen64, (_CONST char *, _CONST char *, FILE *));
+FILE *  _EXFUN(freopen64, (const char *, const char *, FILE *));
 _off64_t _EXFUN(ftello64, (FILE *));
 _off64_t _EXFUN(fseeko64, (FILE *, _off64_t, int));
 int     _EXFUN(fgetpos64, (FILE *, _fpos64_t *));
@@ -561,7 +561,7 @@ FILE *  _EXFUN(tmpfile64, (void));
 
 FILE * _EXFUN(_fdopen64_r, (struct _reent *, int, const char *));
 FILE *  _EXFUN(_fopen64_r, (struct _reent *,const char *, const char *));
-FILE *  _EXFUN(_freopen64_r, (struct _reent *, _CONST char *, _CONST char *, FILE *));
+FILE *  _EXFUN(_freopen64_r, (struct _reent *, const char *, const char *, FILE *));
 _off64_t _EXFUN(_ftello64_r, (struct _reent *, FILE *));
 _off64_t _EXFUN(_fseeko64_r, (struct _reent *, FILE *, _off64_t, int));
 int     _EXFUN(_fgetpos64_r, (struct _reent *, FILE *, _fpos64_t *));
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index c3c591d20..ac433db21 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -93,8 +93,8 @@ _VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
 _VOID _EXFUN_NOTHROW(free,(_PTR));
 char *  _EXFUN(getenv,(const char *__string));
 char * _EXFUN(_getenv_r,(struct _reent *, const char *__string));
-char * _EXFUN(_findenv,(_CONST char *, int *));
-char * _EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *));
+char * _EXFUN(_findenv,(const char *, int *));
+char * _EXFUN(_findenv_r,(struct _reent *, const char *, int *));
 #if __POSIX_VISIBLE >= 200809
 extern char *suboptarg; /* getsubopt(3) external variable */
 int _EXFUN(getsubopt,(char **, char * const *, char **));
diff --git a/newlib/libc/include/sys/errno.h b/newlib/libc/include/sys/errno.h
index a72c37320..89fe1e052 100644
--- a/newlib/libc/include/sys/errno.h
+++ b/newlib/libc/include/sys/errno.h
@@ -17,7 +17,7 @@ extern int *__errno _PARAMS ((void));
 
 /* Please don't use these variables directly.
    Use strerror instead. */
-extern __IMPORT _CONST char * _CONST _sys_errlist[];
+extern __IMPORT const char * const _sys_errlist[];
 extern __IMPORT int _sys_nerr;
 #ifdef __CYGWIN__
 extern __IMPORT const char * const sys_errlist[];
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
index 09ea18316..7475ed21b 100644
--- a/newlib/libc/include/sys/iconvnls.h
+++ b/newlib/libc/include/sys/iconvnls.h
@@ -58,20 +58,20 @@ _EXFUN(_iconv_nls_get_mb_cur_max, (iconv_t cd, int direction));
 
 size_t
 _EXFUN(_iconv_nls_conv, (struct _reent *rptr, iconv_t cd,
-                        _CONST char **inbuf, size_t *inbytesleft,
+                        const char **inbuf, size_t *inbytesleft,
                         char **outbuf, size_t *outbytesleft));
 
-_CONST char *
-_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, _CONST char *file,
-                                      _CONST char *dir, _CONST char *ext));
+const char *
+_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, const char *file,
+                                      const char *dir, const char *ext));
 
 
 int
-_EXFUN(_iconv_nls_open, (struct _reent *rptr, _CONST char *encoding,
+_EXFUN(_iconv_nls_open, (struct _reent *rptr, const char *encoding,
                         iconv_t *towc, iconv_t *fromwc, int flag));
 
 char *
-_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, _CONST char *ca));
+_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, const char *ca));
 
 #endif /* __SYS_ICONVNLS_H__ */
 
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index c045ca549..061f580fb 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -773,7 +773,7 @@ extern __FILE __sf[3];
 #endif
 
 extern struct _reent *_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
-extern struct _reent *_CONST _global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
+extern struct _reent *const _global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
 
 void _reclaim_reent _PARAMS ((struct _reent *));
 
diff --git a/newlib/libc/include/unctrl.h b/newlib/libc/include/unctrl.h
index 004075232..010812ff3 100644
--- a/newlib/libc/include/unctrl.h
+++ b/newlib/libc/include/unctrl.h
@@ -40,7 +40,7 @@
 #define unctrl(c) __unctrl[(c) & 0xff]
 #define unctrllen(ch) __unctrllen[(ch) & 0xff]
 
-extern __IMPORT _CONST char * _CONST __unctrl[256]; /* Control strings. */
-extern __IMPORT _CONST char __unctrllen[256]; /* Control strings length. */
+extern __IMPORT const char * const __unctrl[256]; /* Control strings. */
+extern __IMPORT const char __unctrllen[256]; /* Control strings length. */
 
 #endif /* _UNCTRL_H_ */
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 87cb04b35..f461ef162 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -292,7 +292,7 @@ char *
 _DEFUN(_setlocale_r, (p, category, locale),
        struct _reent *p,
        int category,
-       _CONST char *locale)
+       const char *locale)
 {
 #ifndef _MB_CAPABLE
   if (locale)
@@ -992,7 +992,7 @@ __locale_ctype_ptr (void)
 char *
 _DEFUN (setlocale, (category, locale),
  int category,
- _CONST char *locale)
+ const char *locale)
 {
   return _setlocale_r (_REENT, category, locale);
 }
diff --git a/newlib/libc/machine/cris/sys/errno.h b/newlib/libc/machine/cris/sys/errno.h
index 310388943..dc4ffe28c 100644
--- a/newlib/libc/machine/cris/sys/errno.h
+++ b/newlib/libc/machine/cris/sys/errno.h
@@ -21,7 +21,7 @@ extern int *__errno _PARAMS ((void));
 
 /* Please don't use these variables directly.
    Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
+extern const char * const _sys_errlist[];
 extern int _sys_nerr;
 
 #define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index a2751af85..82987eade 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -82,8 +82,8 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
 {
 
 #ifndef HAVE_HW_PCMP
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index e0e1d7760..8e2dae634 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -83,7 +83,7 @@ QUICKREF
 char*
 _DEFUN (strcpy, (dst0, src0),
  char *__restrict dst0,
- _CONST char *__restrict src0)
+ const char *__restrict src0)
 {
 
 #ifndef HAVE_HW_PCMP
@@ -97,9 +97,9 @@ _DEFUN (strcpy, (dst0, src0),
   return s;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC or DEST is unaligned, then copy bytes.  */
   if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
index ddd9e6a82..059f4463d 100644
--- a/newlib/libc/machine/microblaze/strlen.c
+++ b/newlib/libc/machine/microblaze/strlen.c
@@ -79,20 +79,20 @@ QUICKREF
 
 size_t
 _DEFUN (strlen, (str),
- _CONST char *str)
+ const char *str)
 {
 
 #ifndef HAVE_HW_PCMP
 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
-  _CONST char *start = str;
+  const char *start = str;
 
   while (*str)
     str++;
 
   return str - start;
 #else
-  _CONST char *start = str;
+  const char *start = str;
   unsigned long *aligned_addr;
 
   if (!UNALIGNED (str))
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index 5115c85e2..dd5e2dfd4 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -64,7 +64,7 @@ PORTABILITY
 __int16_t
 _DEFUN (_atosfix16_r, (reent, s),
  struct _reent *reent,
- _CONST char *s)
+ const char *s)
 {
   return _strtosfix16_r (reent, s, NULL);
 }
@@ -72,7 +72,7 @@ _DEFUN (_atosfix16_r, (reent, s),
 #ifndef _REENT_ONLY
 __int16_t
 _DEFUN (atosfix16, (s),
- _CONST char *s)
+ const char *s)
 {
   return strtosfix16 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index 49f4cce20..fed308b65 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -10,7 +10,7 @@
 __int32_t
 _DEFUN (_atosfix32_r, (reent, s),
  struct _reent *reent,
- _CONST char *s)
+ const char *s)
 {
   return _strtosfix32_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atosfix32_r, (reent, s),
 #ifndef _REENT_ONLY
 __int32_t
 _DEFUN (atosfix32, (s),
- _CONST char *s)
+ const char *s)
 {
   return strtosfix32 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index b433778e7..cfc421a3a 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -10,7 +10,7 @@
 __int64_t
 _DEFUN (_atosfix64_r, (reent, s),
  struct _reent *reent,
- _CONST char *s)
+ const char *s)
 {
   return _strtosfix64_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atosfix64_r, (reent, s),
 #ifndef _REENT_ONLY
 __int64_t
 _DEFUN (atosfix64, (s),
- _CONST char *s)
+ const char *s)
 {
   return strtosfix64 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 5148acb7d..84a60b252 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -64,7 +64,7 @@ PORTABILITY
 __uint16_t
 _DEFUN (_atoufix16_r, (reent, s),
  struct _reent *reent,
- _CONST char *s)
+ const char *s)
 {
   return _strtoufix16_r (reent, s, NULL);
 }
@@ -72,7 +72,7 @@ _DEFUN (_atoufix16_r, (reent, s),
 #ifndef _REENT_ONLY
 __uint16_t
 _DEFUN (atoufix16, (s),
- _CONST char *s)
+ const char *s)
 {
   return strtoufix16 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index 01919d406..fc64c75e4 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -10,7 +10,7 @@
 __uint32_t
 _DEFUN (_atoufix32_r, (reent, s),
  struct _reent *reent,
- _CONST char *s)
+ const char *s)
 {
   return _strtoufix32_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atoufix32_r, (reent, s),
 #ifndef _REENT_ONLY
 __uint32_t
 _DEFUN (atoufix32, (s),
- _CONST char *s)
+ const char *s)
 {
   return strtoufix32 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index af71089a6..e8ff7773d 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -10,7 +10,7 @@
 __uint64_t
 _DEFUN (_atoufix64_r, (reent, s),
  struct _reent *reent,
- _CONST char *s)
+ const char *s)
 {
   return _strtoufix64_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atoufix64_r, (reent, s),
 #ifndef _REENT_ONLY
 __uint64_t
 _DEFUN (atoufix64, (s),
- _CONST char *s)
+ const char *s)
 {
   return strtoufix64 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index 84e1171b9..4e998db03 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -94,7 +94,7 @@ PORTABILITY
 __int16_t
 _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
  struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
 
 __int16_t
 _DEFUN (strtosfix16, (s, ptr, base),
- _CONST char *s,
+ 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 1b1487b1a..e8966808e 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -15,7 +15,7 @@
 __int32_t
 _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
  struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
 
 __int32_t
 _DEFUN (strtosfix32, (s, ptr, base),
- _CONST char *s,
+ 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 4ba718c03..f7344fc22 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -15,7 +15,7 @@
 __int64_t
 _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
  struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
  char **endptr)
 {
   union long_double_union ldbl;
@@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
 
 __int64_t
 _DEFUN (strtosfix64, (s, ptr, base),
- _CONST char *s,
+ 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 22de506e3..0757930d4 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -93,7 +93,7 @@ PORTABILITY
 __uint16_t
 _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
  struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -161,7 +161,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
 
 __uint16_t
 _DEFUN (strtoufix16, (s, ptr, base),
- _CONST char *s,
+ 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 05e96675f..60f278daa 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -15,7 +15,7 @@
 __uint32_t
 _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
  struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
  char **endptr)
 {
   union double_union dbl;
@@ -90,7 +90,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
 
 __uint32_t
 _DEFUN (strtoufix32, (s, ptr, base),
- _CONST char *s,
+ 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 5ef53846f..509f51318 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -15,7 +15,7 @@
 __uint64_t
 _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
  struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
  char **endptr)
 {
   union long_double_union ldbl;
@@ -105,7 +105,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
 
 __uint64_t
 _DEFUN (strtoufix64, (s, ptr, base),
- _CONST char *s,
+ const char *s,
  char **ptr)
 {
   return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 0c1c80e1a..e926a7340 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -273,7 +273,7 @@ static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int,  int
 int
 _DEFUN (VFPRINTF, (fp, fmt0, ap),
  FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
  va_list ap)
 {
   CHECK_INIT (_REENT, fp);
@@ -284,7 +284,7 @@ int
 _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
  struct _reent *data,
  FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
  va_list ap)
 {
  register char *fmt; /* format string */
@@ -350,9 +350,9 @@ _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
  * below longer.
  */
 #define PADSIZE 16 /* pad chunk size */
- static _CONST char blanks[PADSIZE] =
+ static const char blanks[PADSIZE] =
  {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
- static _CONST char zeroes[PADSIZE] =
+ static const char zeroes[PADSIZE] =
  {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
 
  /*
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index b82a14088..df5344e20 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -184,7 +184,7 @@ typedef union
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
     register FILE *__restrict fp,
-    _CONST char *__restrict fmt,
+    const char *__restrict fmt,
     va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -194,7 +194,7 @@ _DEFUN (vfscanf, (fp, fmt, ap),
 int
 __svfscanf (fp, fmt0, ap)
      register FILE *fp;
-     char _CONST *fmt0;
+     char const *fmt0;
      va_list ap;
 {
   return __svfscanf_r (_REENT, fp, fmt0, ap);
@@ -206,7 +206,7 @@ int
 _DEFUN (_vfscanf_r, (data, fp, fmt, ap),
     struct _reent *data,
     register FILE *__restrict fp,
-    _CONST char *__restrict fmt,
+    const char *__restrict fmt,
     va_list ap)
 {
   return __svfscanf_r (data, fp, fmt, ap);
@@ -217,7 +217,7 @@ int
 __svfscanf_r (rptr, fp, fmt0, ap)
      struct _reent *rptr;
      register FILE *fp;
-     char _CONST *fmt0;
+     char const *fmt0;
      va_list ap;
 {
   register u_char *fmt = (u_char *) fmt0;
@@ -262,7 +262,7 @@ __svfscanf_r (rptr, fp, fmt0, ap)
 #endif
 
   /* `basefix' is used to avoid `if' tests in the integer scanner */
-  static _CONST short basefix[17] =
+  static const short basefix[17] =
     {10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
   nassigned = 0;
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index b09ffad16..edec03cff 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 FILE *
 _DEFUN (fdopen, (fd, mode),
         int fd,
-        _CONST char *mode)
+        const char *mode)
 {
   errno = ENOSYS;
   return NULL;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index c41d33510..ffa8f6904 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -37,17 +37,17 @@ Author: Joel Schopp <[hidden email]>
 
 typedef struct
 {
-  _CONST char* file;
+  const char* file;
   unsigned int pad0[ 3 ];
-  _CONST char* mode;
+  const char* mode;
   unsigned int pad1[ 3 ];
 } c99_fopen_t;
 
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN (fopen, (file, mode),
- _CONST char *__restrict file,
- _CONST char *__restrict mode)
+ const char *__restrict file,
+ const char *__restrict mode)
 {
   int ret;
   c99_fopen_t args;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 8cf84bb6e..82b72e060 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -37,7 +37,7 @@ Author: Joel Schopp <[hidden email]>
 
 typedef struct
 {
-  _CONST char* s;
+  const char* s;
   unsigned int pad0[ 3 ];
   int fp;
   unsigned int pad1[ 3 ];
@@ -47,7 +47,7 @@ typedef struct
 
 int
 _DEFUN (fputs, (s, fp),
- char _CONST *__restrict s,
+ char const *__restrict s,
  FILE *__restrict fp)
 {
   c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 7c52abef3..0e3f15f83 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -37,9 +37,9 @@ Author: Joel Schopp <[hidden email]>
 
 typedef struct
 {
-  _CONST char *file;
+  const char *file;
   unsigned int pad0[ 3 ];
-  _CONST char *mode;
+  const char *mode;
   unsigned int pad1[ 3 ];
   int fp;
 } c99_freopen_t;
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index 1ebbb8f63..a92cca5a3 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -39,7 +39,7 @@ typedef struct
 {
   int fp;
   unsigned int pad0[ 3 ];
-  _CONST _fpos_t *pos;
+  const _fpos_t *pos;
 } c99_fsetpos_t;
 
 #ifndef _REENT_ONLY
@@ -47,7 +47,7 @@ typedef struct
 int
 _DEFUN (fsetpos, (iop, pos),
  FILE * iop,
- _CONST _fpos_t * pos)
+ const _fpos_t * pos)
 {
   c99_fsetpos_t args;
 
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 6de571069..149eb1345 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -39,7 +39,7 @@ Author: Joel Schopp <[hidden email]>
 
 typedef struct
 {
-  _CONST char* buf;
+  const char* buf;
   unsigned int pad0[ 3 ];
   size_t size;
   unsigned int pad1[ 3 ];
@@ -50,7 +50,7 @@ typedef struct
 
 size_t
 _DEFUN (fwrite, (buf, size, count, fp),
- _CONST _PTR __restrict buf,
+ const _PTR __restrict buf,
  size_t size,
  size_t count,
  FILE * fp)
diff --git a/newlib/libc/machine/spu/impure.c b/newlib/libc/machine/spu/impure.c
index 5fbe0e5f5..f9c86efdc 100644
--- a/newlib/libc/machine/spu/impure.c
+++ b/newlib/libc/machine/spu/impure.c
@@ -11,4 +11,4 @@
 
 struct _reent __ATTRIBUTE_IMPURE_DATA__ _impure_data = _REENT_INIT(_impure_data);
 struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &_impure_data;
-struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data;
+struct _reent *const __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data;
diff --git a/newlib/libc/machine/spu/perror.c b/newlib/libc/machine/spu/perror.c
index 028f44a37..612467318 100644
--- a/newlib/libc/machine/spu/perror.c
+++ b/newlib/libc/machine/spu/perror.c
@@ -7,7 +7,7 @@
 
 typedef struct
 {
-  _CONST char* str;
+  const char* str;
   unsigned int pad0[ 3 ];
   int arg_errno;
   unsigned int pad1[ 3 ];
@@ -15,7 +15,7 @@ typedef struct
 
 void
 _DEFUN (perror, (s),
- _CONST char *s)
+ const char *s)
 
 {
   c99_perror_t arg;
diff --git a/newlib/libc/machine/spu/puts.c b/newlib/libc/machine/spu/puts.c
index 06f4b87b6..427508969 100644
--- a/newlib/libc/machine/spu/puts.c
+++ b/newlib/libc/machine/spu/puts.c
@@ -6,7 +6,7 @@
 
 int
 _DEFUN (puts, (s),
- char _CONST * s)
+ char const * s)
 {
   CHECK_STD_INIT(_REENT);
 
diff --git a/newlib/libc/machine/spu/remove.c b/newlib/libc/machine/spu/remove.c
index 930a98036..1a379dedc 100644
--- a/newlib/libc/machine/spu/remove.c
+++ b/newlib/libc/machine/spu/remove.c
@@ -36,7 +36,7 @@ Author: Joel Schopp <[hidden email]>
 
 int
 remove (filename)
-     _CONST char *filename;
+     const char *filename;
 {
 
   /* The return value gets written over buf
diff --git a/newlib/libc/machine/spu/rename.c b/newlib/libc/machine/spu/rename.c
index bf58fbdc4..e60355de7 100644
--- a/newlib/libc/machine/spu/rename.c
+++ b/newlib/libc/machine/spu/rename.c
@@ -37,16 +37,16 @@ Author: Joel Schopp <[hidden email]>
 
 typedef struct
 {
-  _CONST char *old;
+  const char *old;
   unsigned int pad0[ 3 ];
-  _CONST char *new;
+  const char *new;
   unsigned int pad1[ 3 ];
 } c99_rename_t;
 
 int
 rename (old, new)
-     _CONST char *old;
-     _CONST char *new;
+     const char *old;
+     const char *new;
 {
   c99_rename_t args;
   args.old = old;
diff --git a/newlib/libc/machine/spu/sys/errno.h b/newlib/libc/machine/spu/sys/errno.h
index 85aafcfd5..ef087bd68 100644
--- a/newlib/libc/machine/spu/sys/errno.h
+++ b/newlib/libc/machine/spu/sys/errno.h
@@ -32,7 +32,7 @@ extern struct _reent _impure_data;
 
 /* Please don't use these variables directly.
    Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
+extern const char * const _sys_errlist[];
 extern int _sys_nerr;
 
 #define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index e5ef2fa9f..90dcaef56 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -59,7 +59,7 @@ typedef struct
 int
 _DEFUN (vfprintf, (fp, fmt0, ap),
  FILE *__restrict fp,
- _CONST char *__restrict fmt0,
+ const char *__restrict fmt0,
  va_list ap)
 {
   c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index a497b7ba3..c22f76db7 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -59,7 +59,7 @@ typedef struct
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
     FILE *__restrict fp,
-    _CONST char *__restrict fmt,
+    const char *__restrict fmt,
     va_list ap)
 {
   c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 35b12dfb5..e99144623 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -15,7 +15,7 @@
 
 typedef struct
 {
-  _CONST char* fmt;
+  const char* fmt;
   unsigned int pad0[ 3 ];
   va_list ap;
 } c99_vprintf_t;
@@ -24,7 +24,7 @@ typedef struct
 
 int
 _DEFUN (vprintf, (fmt, ap),
-     _CONST char *fmt,
+     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 29b4948dd..aae6bc45b 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -56,7 +56,7 @@ typedef struct
 
 int
 _DEFUN (vscanf, (fmt, ap),
-     _CONST char *fmt,
+     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 f952b84c1..b30770d68 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -19,7 +19,7 @@ typedef struct
   unsigned int pad0[ 3 ];
   size_t size;
   unsigned int pad1[ 3 ];
-  _CONST char* fmt;
+  const char* fmt;
   unsigned int pad2[ 3 ];
   va_list ap;
 } c99_vsnprintf_t;
@@ -30,7 +30,7 @@ int
 _DEFUN (vsnprintf, (str, size, fmt, ap),
      char *__restrict str,
      size_t size,
-     _CONST char *__restrict fmt,
+     const char *__restrict fmt,
      va_list ap)
 {
   c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 1a44de479..12461c08e 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -28,7 +28,7 @@ typedef struct
 int
 _DEFUN (vsprintf, (str, fmt, ap),
      char *__restrict str,
-     _CONST char *__restrict fmt,
+     const char *__restrict fmt,
      va_list ap)
 {
   c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 38ee1f4b9..7725e6822 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -47,9 +47,9 @@ Author: Joel Schopp <[hidden email]>
 
 typedef struct
 {
-  _CONST char *str;
+  const char *str;
   unsigned int pad0[ 3 ];
-  _CONST char *fmt;
+  const char *fmt;
   unsigned int pad1[ 3 ];
   va_list ap;
 } c99_vsscanf_t;
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vsscanf, (str, fmt, ap),
-    _CONST char *__restrict str,
-    _CONST char *__restrict fmt,
+    const char *__restrict str,
+    const char *__restrict fmt,
     va_list ap)
 {
   c99_vsscanf_t args;
diff --git a/newlib/libc/machine/xscale/strlen.c b/newlib/libc/machine/xscale/strlen.c
index a8bc0851d..70c9a3b44 100644
--- a/newlib/libc/machine/xscale/strlen.c
+++ b/newlib/libc/machine/xscale/strlen.c
@@ -10,7 +10,7 @@
 size_t
 strlen (const char *str)
 {
-  _CONST char *start = str;
+  const char *start = str;
 
   /* Skip unaligned part.  */
   if ((long)str & 3)
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index 6026d195c..5fa30e0ab 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -23,7 +23,7 @@ static char *parse_number ();
 static long _EXFUN(get_number, (char *, long, int));
 static void _EXFUN(print_number, (int, int, long));
 static void _EXFUN(write_char, (char c));
-static void _EXFUN(write_string, (_CONST char *s));
+static void _EXFUN(write_string, (const char *s));
 
 /* Non-zero for big-endian systems.  */
 static int big_endian_p;
@@ -266,7 +266,7 @@ _DEFUN(write_char, (c),
 
 static void
 _DEFUN(write_string, (s),
-     _CONST char *s)
+     const char *s)
 {
   _write_r (_REENT, CONSOLE_FD, s, strlen (s));
 }
diff --git a/newlib/libc/misc/unctrl.c b/newlib/libc/misc/unctrl.c
index e2cdb3861..8bca2a2a5 100644
--- a/newlib/libc/misc/unctrl.c
+++ b/newlib/libc/misc/unctrl.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
 static char sccsid[] = "@(#)unctrl.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-_CONST char * _CONST __unctrl[256] = {
+const char * const __unctrl[256] = {
  "^@",  "^A",  "^B",  "^C",  "^D",  "^E",  "^F",  "^G",
  "^H",  "^I",  "^J",  "^K",  "^L",  "^M",  "^N",  "^O",
  "^P",  "^Q",  "^R",  "^S",  "^T",  "^U",  "^V",  "^W",
@@ -105,7 +105,7 @@ _CONST char * _CONST __unctrl[256] = {
  "0xf8", "0xf9", "0xfa", "0xfb", "0xfc", "0xfd", "0xfe", "0xff",
 };
 
-_CONST char __unctrllen[256] = {
+const char __unctrllen[256] = {
  2, 2, 2, 2, 2, 2, 2, 2,
  2, 2, 2, 2, 2, 2, 2, 2,
  2, 2, 2, 2, 2, 2, 2, 2,
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index beb48c6ae..fbad9f3f8 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -19,8 +19,8 @@ static char ***p_environ = &environ;
 
 int
 _DEFUN(execl, (path, arg0, ...),
-      _CONST char *path,
-      _CONST char *arg0 _DOTS)
+      const char *path,
+      const char *arg0 _DOTS)
 
 #else
 
@@ -28,8 +28,8 @@ _DEFUN(execl, (path, arg0, ...),
 
 int
 _DEFUN(execl, (path, arg0, va_alist),
-     _CONST char *path,
-     _CONST char *arg0,
+     const char *path,
+     const char *arg0,
      va_dcl)
 
 #endif
@@ -37,16 +37,16 @@ _DEFUN(execl, (path, arg0, va_alist),
 {
   int i;
   va_list args;
-  _CONST char *argv[256];
+  const char *argv[256];
 
   va_start (args, arg0);
   argv[0] = arg0;
   i = 1;
   do
-      argv[i] = va_arg (args, _CONST char *);
+      argv[i] = va_arg (args, const char *);
   while (argv[i++] != NULL);
   va_end (args);
 
-  return _execve (path, (char * _CONST  *) argv, *p_environ);
+  return _execve (path, (char * const  *) argv, *p_environ);
 }
 #endif /* !_NO_EXECVE  */
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index f4c759250..c18555c02 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -14,8 +14,8 @@
 
 int
 _DEFUN(execle, (path, arg0, ...),
-      _CONST char *path,
-      _CONST char *arg0 _DOTS)
+      const char *path,
+      const char *arg0 _DOTS)
 
 #else
 
@@ -23,8 +23,8 @@ _DEFUN(execle, (path, arg0, ...),
 
 int
 _DEFUN(execle, (path, arg0, va_alist),
-     _CONST char *path,
-     _CONST char *arg0,
+     const char *path,
+     const char *arg0,
      va_dcl)
 
 #endif
@@ -32,19 +32,19 @@ _DEFUN(execle, (path, arg0, va_alist),
 {
   int i;
   va_list args;
-  _CONST char * _CONST *envp;
-  _CONST char *argv[256];
+  const char * const *envp;
+  const char *argv[256];
 
   va_start (args, arg0);
   argv[0] = arg0;
   i = 1;
   do
-    argv[i] = va_arg (args, _CONST char *);
+    argv[i] = va_arg (args, const char *);
   while (argv[i++] != NULL);
-  envp = va_arg (args, _CONST char * _CONST *);
+  envp = va_arg (args, const char * const *);
   va_end (args);
 
-  return _execve (path, (char * _CONST *) argv, (char * _CONST *) envp);
+  return _execve (path, (char * const *) argv, (char * const *) envp);
 }
 
 #endif /* !_NO_EXECVE  */
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 6731bb905..6b9c2f7e9 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -14,8 +14,8 @@
 
 int
 _DEFUN(execlp, (path, arg0, ...),
-      _CONST char *path,
-      _CONST char *arg0 _DOTS)
+      const char *path,
+      const char *arg0 _DOTS)
 
 #else
 
@@ -23,8 +23,8 @@ _DEFUN(execlp, (path, arg0, ...),
 
 int
 _DEFUN(execlp, (path, arg0, va_alist),
-     _CONST char *path,
-     _CONST char *arg0,
+     const char *path,
+     const char *arg0,
      va_dcl)
 
 #endif
@@ -32,17 +32,17 @@ _DEFUN(execlp, (path, arg0, va_alist),
 {
   int i;
   va_list args;
-  _CONST char *argv[256];
+  const char *argv[256];
 
   va_start (args, arg0);
   argv[0] = arg0;
   i = 1;
   do
-      argv[i] = va_arg (args, _CONST char *);
+      argv[i] = va_arg (args, const char *);
   while (argv[i++] != NULL);
   va_end (args);
 
-  return execvp (path, (char * _CONST *) argv);
+  return execvp (path, (char * const *) argv);
 }
 
 #endif /* !_NO_EXECVE  */
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 049a5381d..96220dd98 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -18,7 +18,7 @@ _DEFUN (execv, (path, argv),
  const char *path,
  char * const argv[])
 {
-  return _execve (path, (char * _CONST *) argv, *p_environ);
+  return _execve (path, (char * const *) argv, *p_environ);
 }
 
 #endif /* !_NO_EXECVE  */
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index db7e03456..1c1fd3a01 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -37,8 +37,8 @@ _DEFUN (strccpy, (s1, s2, c),
 
 int
 _DEFUN (execvp, (file, argv),
- _CONST char *file,
- char * _CONST argv[])
+ const char *file,
+ char * const argv[])
 {
   char *path = getenv ("PATH");
   char buf[MAXNAMLEN];
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index 8e54de7fa..cade6b005 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -147,7 +147,7 @@ typedef struct __posix_spawn_file_actions_entry {
  */
 
 static int
-process_spawnattr(_CONST posix_spawnattr_t sa)
+process_spawnattr(const posix_spawnattr_t sa)
 {
  struct sigaction sigact = { .sa_flags = 0, .sa_handler = SIG_DFL };
  int i;
@@ -240,7 +240,7 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae)
 }
 
 static int
-process_file_actions(_CONST posix_spawn_file_actions_t fa)
+process_file_actions(const posix_spawn_file_actions_t fa)
 {
  posix_spawn_file_actions_entry_t *fae;
  int error;
@@ -255,10 +255,10 @@ process_file_actions(_CONST posix_spawn_file_actions_t fa)
 }
 
 static int
-do_posix_spawn(pid_t *pid, _CONST char *path,
- _CONST posix_spawn_file_actions_t *fa,
- _CONST posix_spawnattr_t *sa,
- char * _CONST argv[], char * _CONST envp[], int use_env_path)
+do_posix_spawn(pid_t *pid, const char *path,
+ const posix_spawn_file_actions_t *fa,
+ const posix_spawnattr_t *sa,
+ char * const argv[], char * const envp[], int use_env_path)
 {
  pid_t p;
  volatile int error = 0;
@@ -296,11 +296,11 @@ do_posix_spawn(pid_t *pid, _CONST char *path,
 int
 _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
  pid_t *pid,
- _CONST char *path,
- _CONST posix_spawn_file_actions_t *fa,
- _CONST posix_spawnattr_t *sa,
- char * _CONST argv[],
- char * _CONST envp[])
+ const char *path,
+ const posix_spawn_file_actions_t *fa,
+ const posix_spawnattr_t *sa,
+ char * const argv[],
+ char * const envp[])
 {
  return do_posix_spawn(pid, path, fa, sa, argv, envp, 0);
 }
@@ -308,11 +308,11 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
 int
 _DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
  pid_t *pid,
- _CONST char *path,
- _CONST posix_spawn_file_actions_t *fa,
- _CONST posix_spawnattr_t *sa,
- char * _CONST argv[],
- char * _CONST envp[])
+ const char *path,
+ const posix_spawn_file_actions_t *fa,
+ const posix_spawnattr_t *sa,
+ char * const argv[],
+ char * const envp[])
 {
  return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
 }
@@ -360,7 +360,7 @@ int
 _DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
  posix_spawn_file_actions_t * __restrict fa,
  int fildes,
- _CONST char * __restrict path,
+ const char * __restrict path,
  int oflag,
  mode_t mode)
 {
@@ -468,7 +468,7 @@ _DEFUN(posix_spawnattr_destroy, (sa),
 
 int
 _DEFUN(posix_spawnattr_getflags, (sa, flags),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
  short * __restrict flags)
 {
  *flags = (*sa)->sa_flags;
@@ -477,7 +477,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
 
 int
 _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
  pid_t * __restrict pgroup)
 {
  *pgroup = (*sa)->sa_pgroup;
@@ -486,7 +486,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
 
 int
 _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
  struct sched_param * __restrict schedparam)
 {
  *schedparam = (*sa)->sa_schedparam;
@@ -495,7 +495,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
 
 int
 _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
  int * __restrict schedpolicy)
 {
  *schedpolicy = (*sa)->sa_schedpolicy;
@@ -504,7 +504,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
 
 int
 _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
  sigset_t * __restrict sigdefault)
 {
  *sigdefault = (*sa)->sa_sigdefault;
@@ -513,7 +513,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
 
 int
 _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
  sigset_t * __restrict sigmask)
 {
  *sigmask = (*sa)->sa_sigmask;
@@ -541,7 +541,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
 int
 _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
  posix_spawnattr_t * __restrict sa,
- _CONST struct sched_param * __restrict schedparam)
+ const struct sched_param * __restrict schedparam)
 {
  (*sa)->sa_schedparam = *schedparam;
  return (0);
@@ -559,7 +559,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
 int
 _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
  posix_spawnattr_t * __restrict sa,
- _CONST sigset_t * __restrict sigdefault)
+ const sigset_t * __restrict sigdefault)
 {
  (*sa)->sa_sigdefault = *sigdefault;
  return (0);
@@ -568,7 +568,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
 int
 _DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
  posix_spawnattr_t * __restrict sa,
- _CONST sigset_t * __restrict sigmask)
+ const sigset_t * __restrict sigmask)
 {
  (*sa)->sa_sigmask = *sigmask;
  return (0);
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index cb78fba76..0dc531384 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -47,9 +47,9 @@ DESCRIPTION
 int
 _DEFUN (_execve_r, (ptr, name, argv, env),
      struct _reent *ptr,
-     _CONST char *name,
-     char *_CONST argv[],
-     char *_CONST env[])
+     const char *name,
+     char *const argv[],
+     char *const env[])
 {
   int ret;
 
diff --git a/newlib/libc/reent/impure.c b/newlib/libc/reent/impure.c
index f5918c88f..76f67459e 100644
--- a/newlib/libc/reent/impure.c
+++ b/newlib/libc/reent/impure.c
@@ -25,4 +25,4 @@ static struct _reent __ATTRIBUTE_IMPURE_DATA__ impure_data = _REENT_INIT (impure
 extern struct _reent reent_data __attribute__ ((alias("impure_data")));
 #endif
 struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &impure_data;
-struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &impure_data;
+struct _reent *const __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &impure_data;
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 59113d26e..5e85f2d2e 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -45,8 +45,8 @@ DESCRIPTION
 int
 _DEFUN (_link_r, (ptr, old, new),
      struct _reent *ptr,
-     _CONST char *old,
-     _CONST char *new)
+     const char *old,
+     const char *new)
 {
   int ret;
 
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index 4c2c94f9c..dca20dc2c 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -42,7 +42,7 @@ DESCRIPTION
 int
 _DEFUN (_mkdir_r, (ptr, path, mode),
      struct _reent *ptr,
-     _CONST char *path,
+     const char *path,
      int mode)
 {
   int ret;
diff --git a/newlib/libc/reent/open64r.c b/newlib/libc/reent/open64r.c
index 6b39fa1fd..84bd67e34 100644
--- a/newlib/libc/reent/open64r.c
+++ b/newlib/libc/reent/open64r.c
@@ -44,7 +44,7 @@ DESCRIPTION
 int
 _open64_r (ptr, file, flags, mode)
      struct _reent *ptr;
-     _CONST char *file;
+     const char *file;
      int flags;
      int mode;
 {
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index f38ff8458..33ace75ad 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -41,7 +41,7 @@ DESCRIPTION
 int
 _DEFUN (_open_r, (ptr, file, flags, mode),
      struct _reent *ptr,
-     _CONST char *file,
+     const char *file,
      int flags,
      int mode)
 {
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index e55c2f291..736c1a30f 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -42,8 +42,8 @@ DESCRIPTION
 int
 _DEFUN (_rename_r, (ptr, old, new),
      struct _reent *ptr,
-     _CONST char *old,
-     _CONST char *new)
+     const char *old,
+     const char *new)
 {
   int ret = 0;
 
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 134ca82ef..2077c0a2e 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -47,7 +47,7 @@ DESCRIPTION
 int
 _DEFUN (_stat64_r, (ptr, file, pstat),
      struct _reent *ptr,
-     _CONST char *file,
+     const char *file,
      struct stat64 *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 2b271e10f..fb27ab0c0 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -47,7 +47,7 @@ DESCRIPTION
 int
 _DEFUN (_stat_r, (ptr, file, pstat),
      struct _reent *ptr,
-     _CONST char *file,
+     const char *file,
      struct stat *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index eb000be15..0ef0ff56e 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -40,7 +40,7 @@ DESCRIPTION
 int
 _DEFUN (_unlink_r, (ptr, file),
      struct _reent *ptr,
-     _CONST char *file)
+     const char *file)
 {
   int ret;
 
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 4e06d74ef..4c4f95f77 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -41,7 +41,7 @@ _ssize_t
 _DEFUN (_write_r, (ptr, fd, buf, cnt),
      struct _reent *ptr,
      int fd,
-     _CONST _PTR buf,
+     const _PTR buf,
      size_t cnt)
 {
   _ssize_t ret;
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index c15ea64d2..86380a816 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -57,8 +57,8 @@ No supporting OS subroutines are required.
 
 _PTR
 _DEFUN (bsearch, (key, base, nmemb, size, compar),
- _CONST _PTR key,
- _CONST _PTR base,
+ const _PTR key,
+ const _PTR base,
  size_t nmemb,
  size_t size,
  int _EXFNPTR(compar, (const _PTR, const _PTR)))
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index f0c9b6ee6..6263c3f70 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -36,7 +36,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 _VOID
 _DEFUN(psignal, (sig, s),
        int sig,
-       _CONST char *s)
+       const char *s)
 {
   if (s != NULL && *s != '\0')
     fprintf (stderr, "%s: %s\n", s, strsignal (sig));
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 7dda3c359..82b7a9bc2 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -56,7 +56,7 @@ FILE *
 _DEFUN(_fdopen_r, (ptr, fd, mode),
        struct _reent *ptr,
        int fd,
-       _CONST char *mode)
+       const char *mode)
 {
   register FILE *fp;
   int flags, oflags;
@@ -125,7 +125,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
 FILE *
 _DEFUN(fdopen, (fd, mode),
        int fd,
-       _CONST char *mode)
+       const char *mode)
 {
   return _fdopen_r (_REENT, fd, mode);
 }
diff --git a/newlib/libc/stdio/fiscanf.c b/newlib/libc/stdio/fiscanf.c
index 53fee8454..7b497bddb 100644
--- a/newlib/libc/stdio/fiscanf.c
+++ b/newlib/libc/stdio/fiscanf.c
@@ -29,7 +29,7 @@
 
 int
 #ifdef _HAVE_STDC
-fiscanf(FILE *fp, _CONST char *fmt, ...)
+fiscanf(FILE *fp, const char *fmt, ...)
 #else
 fiscanf(FILE *fp, fmt, va_alist)
        FILE *fp;
@@ -54,7 +54,7 @@ fiscanf(FILE *fp, fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_fiscanf_r(struct _reent *ptr, FILE *fp, _CONST char *fmt, ...)
+_fiscanf_r(struct _reent *ptr, FILE *fp, const char *fmt, ...)
 #else
 _fiscanf_r(ptr, FILE *fp, fmt, va_alist)
           struct _reent *ptr;
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 92ec70670..e6b044557 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -115,8 +115,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 FILE *
 _DEFUN(_fopen_r, (ptr, file, mode),
        struct _reent *ptr,
-       _CONST char *__restrict file,
-       _CONST char *__restrict mode)
+       const char *__restrict file,
+       const char *__restrict mode)
 {
   register FILE *fp;
   register int f;
@@ -164,8 +164,8 @@ _DEFUN(_fopen_r, (ptr, file, mode),
 
 FILE *
 _DEFUN(fopen, (file, mode),
-       _CONST char *file,
-       _CONST char *mode)
+       const char *file,
+       const char *mode)
 {
   return _fopen_r (_REENT, file, mode);
 }
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 7adb89a04..0fd051bad 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -88,7 +88,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 int
 _DEFUN(_fputs_r, (ptr, s, fp),
        struct _reent * ptr,
-       char _CONST *__restrict s,
+       char const *__restrict s,
        FILE *__restrict fp)
 {
 #ifdef _FVWRITE_IN_STREAMIO
@@ -109,7 +109,7 @@ _DEFUN(_fputs_r, (ptr, s, fp),
   _newlib_flockfile_end (fp);
   return result;
 #else
-  _CONST char *p = s;
+  const char *p = s;
 
   CHECK_INIT(ptr, fp);
 
@@ -136,7 +136,7 @@ error:
 #ifndef _REENT_ONLY
 int
 _DEFUN(fputs, (s, fp),
-       char _CONST *__restrict s,
+       char const *__restrict s,
        FILE *__restrict fp)
 {
   return _fputs_r (_REENT, s, fp);
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index b9fee0c7b..7e70b9a98 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -244,8 +244,8 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
 
 FILE *
 _DEFUN(freopen, (file, mode, fp),
-       _CONST char *__restrict file,
-       _CONST char *__restrict mode,
+       const char *__restrict file,
+       const char *__restrict mode,
        register FILE *__restrict fp)
 {
   return _freopen_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 87b51dd88..40705a5e7 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -29,7 +29,7 @@
 
 int
 #ifdef _HAVE_STDC
-fscanf(FILE *__restrict fp, _CONST char *__restrict fmt, ...)
+fscanf(FILE *__restrict fp, const char *__restrict fmt, ...)
 #else
 fscanf(FILE *fp, fmt, va_alist)
        FILE *fp;
@@ -60,7 +60,7 @@ _EXFUN(fiscanf, (FILE *, const char *, ...)
 
 int
 #ifdef _HAVE_STDC
-_fscanf_r(struct _reent *ptr, FILE *__restrict fp, _CONST char *__restrict fmt, ...)
+_fscanf_r(struct _reent *ptr, FILE *__restrict fp, const char *__restrict fmt, ...)
 #else
 _fscanf_r(ptr, FILE *fp, fmt, va_alist)
           struct _reent *ptr;
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index ffc9d794c..d765081a6 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -62,7 +62,7 @@ int
 _DEFUN(_fsetpos_r, (ptr, iop, pos),
        struct _reent * ptr,
        FILE * iop,
-       _CONST _fpos_t * pos)
+       const _fpos_t * pos)
 {
   int x = _fseek_r (ptr, iop, *pos, SEEK_SET);
 
@@ -76,7 +76,7 @@ _DEFUN(_fsetpos_r, (ptr, iop, pos),
 int
 _DEFUN(fsetpos, (iop, pos),
        FILE * iop,
-       _CONST _fpos_t * pos)
+       const _fpos_t * pos)
 {
   return _fsetpos_r (_REENT, iop, pos);
 }
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index a0432a03d..c93888dc4 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -51,7 +51,7 @@ _DEFUN(__sfvwrite_r, (ptr, fp, uio),
        register struct __suio *uio)
 {
   register size_t len;
-  register _CONST char *p = NULL;
+  register const char *p = NULL;
   register struct __siov *iov;
   register _READ_WRITE_RETURN_TYPE w, s;
   char *nl;
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 5c078fe68..8b01a2a9d 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -22,7 +22,7 @@
  * I/O descriptors for __sfvwrite_r().
  */
 struct __siov {
- _CONST _PTR     iov_base;
+ const _PTR     iov_base;
  size_t iov_len;
 };
 struct __suio {
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index a805eff7f..cfaa2499a 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -110,7 +110,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 size_t
 _DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
        struct _reent * ptr,
-       _CONST _PTR __restrict buf,
+       const _PTR __restrict buf,
        size_t size,
        size_t count,
        FILE * __restrict fp)
@@ -144,7 +144,7 @@ _DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
   return (n - uio.uio_resid) / size;
 #else
   size_t i = 0;
-  _CONST char *p = buf;
+  const char *p = buf;
   n = count * size;
   CHECK_INIT (ptr, fp);
 
@@ -171,7 +171,7 @@ ret:
 #ifndef _REENT_ONLY
 size_t
 _DEFUN(fwrite, (buf, size, count, fp),
-       _CONST _PTR __restrict buf,
+       const _PTR __restrict buf,
        size_t size,
        size_t count,
        FILE * fp)
diff --git a/newlib/libc/stdio/fwscanf.c b/newlib/libc/stdio/fwscanf.c
index 8572f4185..1b86a3472 100644
--- a/newlib/libc/stdio/fwscanf.c
+++ b/newlib/libc/stdio/fwscanf.c
@@ -26,7 +26,7 @@
 #ifndef _REENT_ONLY
 
 int
-fwscanf (FILE *__restrict fp, _CONST wchar_t *__restrict fmt, ...)
+fwscanf (FILE *__restrict fp, const wchar_t *__restrict fmt, ...)
 {
   int ret;
   va_list ap;
@@ -40,7 +40,7 @@ fwscanf (FILE *__restrict fp, _CONST wchar_t *__restrict fmt, ...)
 #endif /* !_REENT_ONLY */
 
 int
-_fwscanf_r (struct _reent *ptr, FILE *fp, _CONST wchar_t *fmt, ...)
+_fwscanf_r (struct _reent *ptr, FILE *fp, const wchar_t *fmt, ...)
 {
   int ret;
   va_list ap;
diff --git a/newlib/libc/stdio/iscanf.c b/newlib/libc/stdio/iscanf.c
index f35acd2ed..aefd1a4ac 100644
--- a/newlib/libc/stdio/iscanf.c
+++ b/newlib/libc/stdio/iscanf.c
@@ -29,7 +29,7 @@
 
 int
 #ifdef _HAVE_STDC
-iscanf(_CONST char *fmt, ...)
+iscanf(const char *fmt, ...)
 #else
 iscanf(fmt, va_alist)
       char *fmt;
@@ -54,7 +54,7 @@ iscanf(fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_iscanf_r(struct _reent *ptr, _CONST char *fmt, ...)
+_iscanf_r(struct _reent *ptr, const char *fmt, ...)
 #else
 _iscanf_r(ptr, fmt, va_alist)
          struct _reent *ptr;
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 511e5e35f..b5fd1198a 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -143,14 +143,14 @@
 extern wint_t _EXFUN(__fgetwc, (struct _reent *, FILE *));
 extern wint_t _EXFUN(__fputwc, (struct _reent *, wchar_t, FILE *));
 extern u_char *_EXFUN(__sccl, (char *, u_char *fmt));
-extern int    _EXFUN(__svfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int    _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int    _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int    _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int    _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
-extern int    _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
-extern int    _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
-extern int    _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
+extern int    _EXFUN(__svfscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int    _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int    _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int    _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int    _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
+extern int    _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
+extern int    _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
+extern int    _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
 int      _EXFUN(_svfprintf_r,(struct _reent *, FILE *, const char *,
   va_list)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
@@ -162,7 +162,7 @@ int      _EXFUN(_svfwprintf_r,(struct _reent *, FILE *, const wchar_t *,
 int      _EXFUN(_svfiwprintf_r,(struct _reent *, FILE *, const wchar_t *,
   va_list));
 extern FILE  *_EXFUN(__sfp,(struct _reent *));
-extern int    _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
+extern int    _EXFUN(__sflags,(struct _reent *,const char*, int*));
 extern int    _EXFUN(__sflush_r,(struct _reent *,FILE *));
 #ifdef _STDIO_BSD_SEMANTICS
 extern int    _EXFUN(__sflushw_r,(struct _reent *,FILE *));
@@ -347,6 +347,6 @@ typedef enum __packed {
   PWPOS,   /* get positional parameter value for variable width or precision */
 } __ACTION;
 
-extern _CONST __CH_CLASS __chclass[256];
-extern _CONST __STATE __state_table[MAX_STATE][MAX_CH_CLASS];
-extern _CONST __ACTION __action_table[MAX_STATE][MAX_CH_CLASS];
+extern const __CH_CLASS __chclass[256];
+extern const __STATE __state_table[MAX_STATE][MAX_CH_CLASS];
+extern const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS];
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 648bb33a7..ad75b195c 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -175,7 +175,7 @@ int
 _DEFUN(__ssputs_r, (ptr, fp, buf, len),
        struct _reent *ptr,
        FILE *fp,
-       _CONST char *buf,
+       const char *buf,
        size_t len)
 {
   register int w;
@@ -251,7 +251,7 @@ _DEFUN(__ssprint_r, (ptr, fp, uio),
   register size_t len;
   register int w;
   register struct __siov *iov;
-  register _CONST char *p = NULL;
+  register const char *p = NULL;
 
   iov = uio->uio_iov;
   len = 0;
@@ -407,7 +407,7 @@ int
 _DEFUN(__sfputs_r, (ptr, fp, buf, len),
        struct _reent *ptr,
        FILE *fp,
-       _CONST char *buf,
+       const char *buf,
        size_t len)
 {
   register int i;
@@ -438,13 +438,13 @@ _DEFUN(__sfputs_r, (ptr, fp, buf, len),
 }
 #endif /* STRING_ONLY.  */
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
+int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
 
 #ifndef STRING_ONLY
 int
 _DEFUN(VFPRINTF, (fp, fmt0, ap),
        FILE * fp,
-       _CONST char *fmt0,
+       const char *fmt0,
        va_list ap)
 {
   int result;
@@ -474,7 +474,7 @@ int
 _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
        struct _reent *data,
        FILE * fp,
-       _CONST char *fmt0,
+       const char *fmt0,
        va_list ap)
 {
   register char *fmt; /* Format string.  */
@@ -484,7 +484,7 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
   struct _prt_data_t prt_data; /* All data for decoding format string.  */
 
   /* Output function pointer.  */
-  int (*pfunc)(struct _reent *, FILE *, _CONST char *, size_t len);
+  int (*pfunc)(struct _reent *, FILE *, const char *, size_t len);
 
   pfunc = __SPRINT;
 
diff --git a/newlib/libc/stdio/nano-vfprintf_float.c b/newlib/libc/stdio/nano-vfprintf_float.c
index aca24aec0..98893e97b 100644
--- a/newlib/libc/stdio/nano-vfprintf_float.c
+++ b/newlib/libc/stdio/nano-vfprintf_float.c
@@ -164,7 +164,7 @@ int
 _printf_float (struct _reent *data,
        struct _prt_data_t *pdata,
        FILE * fp,
-       int (*pfunc) (struct _reent *, FILE *, _CONST char *,
+       int (*pfunc) (struct _reent *, FILE *, const char *,
      size_t len), va_list * ap)
 {
 #define _fpvalue (pdata->_double_)
diff --git a/newlib/libc/stdio/nano-vfprintf_i.c b/newlib/libc/stdio/nano-vfprintf_i.c
index 46945b34a..f7da95251 100644
--- a/newlib/libc/stdio/nano-vfprintf_i.c
+++ b/newlib/libc/stdio/nano-vfprintf_i.c
@@ -51,7 +51,7 @@ _printf_common (struct _reent *data,
  int *realsz,
  FILE *fp,
  int (*pfunc)(struct _reent *, FILE *,
-     _CONST char *, size_t len))
+     const char *, size_t len))
 {
   int n;
   /*
@@ -106,7 +106,7 @@ error:
 }
 int
 _printf_i (struct _reent *data, struct _prt_data_t *pdata, FILE *fp,
-   int (*pfunc)(struct _reent *, FILE *, _CONST char *, size_t len),
+   int (*pfunc)(struct _reent *, FILE *, const char *, size_t len),
    va_list *ap)
 {
   /* Field size expanded by dprec.  */
diff --git a/newlib/libc/stdio/nano-vfprintf_local.h b/newlib/libc/stdio/nano-vfprintf_local.h
index 83b479e56..51e1df815 100644
--- a/newlib/libc/stdio/nano-vfprintf_local.h
+++ b/newlib/libc/stdio/nano-vfprintf_local.h
@@ -215,11 +215,11 @@ _printf_common (struct _reent *data,
  int *realsz,
  FILE *fp,
  int (*pfunc)(struct _reent *, FILE *,
-     _CONST char *, size_t len));
+     const char *, size_t len));
 
 extern int
 _printf_i (struct _reent *data, struct _prt_data_t *pdata, FILE *fp,
-   int (*pfunc)(struct _reent *, FILE *, _CONST char *, size_t len),
+   int (*pfunc)(struct _reent *, FILE *, const char *, size_t len),
    va_list *ap);
 
 /* Make _printf_float weak symbol, so it won't be linked in if target program
@@ -229,6 +229,6 @@ _printf_float (struct _reent *data,
        struct _prt_data_t *pdata,
        FILE *fp,
        int (*pfunc)(struct _reent *, FILE *,
-    _CONST char *, size_t len),
+    const char *, size_t len),
        va_list *ap) _ATTRIBUTE((__weak__));
 #endif
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 479f9776f..0196b285a 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -137,7 +137,7 @@ Supporting OS subroutines required:
 int
 _DEFUN(VFSCANF, (fp, fmt, ap),
        register FILE *fp,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -151,7 +151,7 @@ _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
 int
 _DEFUN(__SVFSCANF, (fp, fmt0, ap),
        register FILE *fp,
-       char _CONST *fmt0,
+       char const *fmt0,
        va_list ap)
 {
   return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -163,7 +163,7 @@ int
 _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
        struct _reent *data,
        register FILE *fp,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   CHECK_INIT(data, fp);
@@ -262,7 +262,7 @@ int
 _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
        struct _reent *rptr,
        register FILE *fp,
-       char _CONST *fmt0,
+       char const *fmt0,
        va_list ap)
 {
   register u_char *fmt = (u_char *) fmt0;
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index cd1829180..cda8a1112 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -61,7 +61,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 _VOID
 _DEFUN(_perror_r, (ptr, s),
        struct _reent *ptr,
-       _CONST char *s)
+       const char *s)
 {
   char *error;
   int dummy;
@@ -83,7 +83,7 @@ _DEFUN(_perror_r, (ptr, s),
 
 _VOID
 _DEFUN(perror, (s),
-       _CONST char *s)
+       const char *s)
 {
   _perror_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 36cc83203..89a9485bb 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -67,7 +67,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 int
 _DEFUN(_puts_r, (ptr, s),
        struct _reent *ptr,
-       _CONST char * s)
+       const char * s)
 {
 #ifdef _FVWRITE_IN_STREAMIO
   int result;
@@ -126,7 +126,7 @@ err:
 
 int
 _DEFUN(puts, (s),
-       char _CONST * s)
+       char const * s)
 {
   return _puts_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 1e3c78c3e..5377d87d3 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -53,7 +53,7 @@ _DEFUN(putw, (w, fp),
        int w,
        register FILE *fp)
 {
-  if (fwrite ((_CONST char*)&w, sizeof (w), 1, fp) != 1)
+  if (fwrite ((const char*)&w, sizeof (w), 1, fp) != 1)
     return EOF;
   return 0;
 }
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index 18c468d61..810b282ac 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -61,7 +61,7 @@ Supporting OS subroutine required: <<unlink>>.
 int
 _DEFUN(_remove_r, (ptr, filename),
        struct _reent *ptr,
-       _CONST char *filename)
+       const char *filename)
 {
   if (_unlink_r (ptr, filename) == -1)
     return -1;
@@ -73,7 +73,7 @@ _DEFUN(_remove_r, (ptr, filename),
 
 int
 _DEFUN(remove, (filename),
-       _CONST char *filename)
+       const char *filename)
 {
   return _remove_r (_REENT, filename);
 }
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index a2b0d4188..a32770846 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -55,8 +55,8 @@ Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
 
 int
 _DEFUN(rename, (old, new),
-       _CONST char *old,
-       _CONST char *new)
+       const char *old,
+       const char *new)
 {
   return _rename_r (_REENT, old, new);
 }
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index 23e97b83d..87cbeb7b8 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -29,7 +29,7 @@
 
 int
 #ifdef _HAVE_STDC
-scanf(_CONST char *__restrict fmt, ...)
+scanf(const char *__restrict fmt, ...)
 #else
 scanf(fmt, va_alist)
       char *fmt;
@@ -61,7 +61,7 @@ _EXFUN(iscanf, (const char *, ...)
 
 int
 #ifdef _HAVE_STDC
-_scanf_r(struct _reent *ptr, _CONST char *__restrict fmt, ...)
+_scanf_r(struct _reent *ptr, const char *__restrict fmt, ...)
 #else
 _scanf_r(ptr, fmt, va_alist)
          struct _reent *ptr;
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 861fc8d67..e33687563 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -107,12 +107,12 @@ int
 _DEFUN(_siprintf_r, (ptr, str, fmt),
        struct _reent *ptr,
        char *str,
-       _CONST char *fmt _DOTS)
+       const char *fmt _DOTS)
 #else
 _siprintf_r(ptr, str, fmt, va_alist)
            struct _reent *ptr;
            char *str;
-           _CONST char *fmt;
+           const char *fmt;
            va_dcl
 #endif
 {
@@ -141,11 +141,11 @@ int
 #ifdef _HAVE_STDC
 _DEFUN(siprintf, (str, fmt),
        char *str,
-       _CONST char *fmt _DOTS)
+       const char *fmt _DOTS)
 #else
 siprintf(str, fmt, va_alist)
         char *str;
-        _CONST char *fmt;
+        const char *fmt;
         va_dcl
 #endif
 {
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index 81d60d0ba..d5e62b40d 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -88,13 +88,13 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef _HAVE_STDC
 int
 _DEFUN(siscanf, (str, fmt),
-       _CONST char *str,
-       _CONST char *fmt _DOTS)
+       const char *str,
+       const char *fmt _DOTS)
 #else
 int
 siscanf(str, fmt, va_alist)
-       _CONST char *str;
-       _CONST char *fmt;
+       const char *str;
+       const char *fmt;
        va_dcl
 #endif
 {
@@ -125,14 +125,14 @@ siscanf(str, fmt, va_alist)
 int
 _DEFUN(_siscanf_r, (ptr, str, fmt),
        struct _reent *ptr,
-       _CONST char *str,
-       _CONST char *fmt _DOTS)
+       const char *str,
+       const char *fmt _DOTS)
 #else
 int
 _siscanf_r(ptr, str, fmt, va_alist)
           struct _reent *ptr;
-          _CONST char *str;
-          _CONST char *fmt;
+          const char *str;
+          const char *fmt;
           va_dcl
 #endif
 {
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index 65e5b067f..90e30271e 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -36,13 +36,13 @@ _DEFUN (_sniprintf_r, (ptr, str, size, fmt),
  struct _reent *ptr,
  char *str,
  size_t size,
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
 #else
 _sniprintf_r (ptr, str, size, fmt, va_alist)
      struct _reent *ptr;
      char *str;
      size_t size;
-     _CONST char *fmt;
+     const char *fmt;
      va_dcl
 #endif
 {
@@ -80,12 +80,12 @@ int
 _DEFUN (sniprintf, (str, size, fmt),
  char *str,
  size_t size,
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
 #else
 sniprintf (str, size, fmt, va_alist)
      char *str;
      size_t size;
-     _CONST char *fmt;
+     const char *fmt;
      va_dcl
 #endif
 {
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index 2066a56ba..aa7a6364d 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -35,13 +35,13 @@ _DEFUN(_snprintf_r, (ptr, str, size, fmt),
        struct _reent *ptr,
        char *__restrict str,
        size_t size,
-       _CONST char *__restrict fmt _DOTS)
+       const char *__restrict fmt _DOTS)
 #else
 _snprintf_r(ptr, str, size, fmt, va_alist)
             struct _reent *ptr;
             char *str;
             size_t size;
-            _CONST char *fmt;
+            const char *fmt;
             va_dcl
 #endif
 {
@@ -85,12 +85,12 @@ int
 _DEFUN(snprintf, (str, size, fmt),
        char *__restrict str,
        size_t size,
-       _CONST char *__restrict fmt _DOTS)
+       const char *__restrict fmt _DOTS)
 #else
 snprintf(str, size, fmt, va_alist)
          char *str;
          size_t size;
-         _CONST char *fmt;
+         const char *fmt;
          va_dcl
 #endif
 {
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 7ed0a0fd4..1948ff158 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -583,12 +583,12 @@ int
 _DEFUN(_sprintf_r, (ptr, str, fmt),
        struct _reent *ptr,
        char *__restrict str,
-       _CONST char *__restrict fmt _DOTS)
+       const char *__restrict fmt _DOTS)
 #else
 _sprintf_r(ptr, str, fmt, va_alist)
            struct _reent *ptr;
            char *__restrict str;
-           _CONST char *__restrict fmt;
+           const char *__restrict fmt;
            va_dcl
 #endif
 {
@@ -623,11 +623,11 @@ int
 #ifdef _HAVE_STDC
 _DEFUN(sprintf, (str, fmt),
        char *__restrict str,
-       _CONST char *__restrict fmt _DOTS)
+       const char *__restrict fmt _DOTS)
 #else
 sprintf(str, fmt, va_alist)
         char *str;
-        _CONST char *fmt;
+        const char *fmt;
         va_dcl
 #endif
 {
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index bfec067e9..8a3232525 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -427,13 +427,13 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifdef _HAVE_STDC
 int
 _DEFUN(sscanf, (str, fmt),
-       _CONST char *__restrict str,
-       _CONST char * fmt _DOTS)
+       const char *__restrict str,
+       const char * fmt _DOTS)
 #else
 int
 sscanf(str, fmt, va_alist)
-       _CONST char *str;
-       _CONST char *fmt;
+       const char *str;
+       const char *fmt;
        va_dcl
 #endif
 {
@@ -470,14 +470,14 @@ _EXFUN(siscanf, (const char *, const char *, ...)
 int
 _DEFUN(_sscanf_r, (ptr, str, fmt),
        struct _reent *ptr,
-       _CONST char *__restrict str,
-       _CONST char *__restrict fmt _DOTS)
+       const char *__restrict str,
+       const char *__restrict fmt _DOTS)
 #else
 int
 _sscanf_r(ptr, str, fmt, va_alist)
           struct _reent *ptr;
-          _CONST char *__restrict str;
-          _CONST char *__restrict fmt;
+          const char *__restrict str;
+          const char *__restrict fmt;
           va_dcl
 #endif
 {
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index 0ddc492ee..47a2657a2 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -557,7 +557,7 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
        struct _reent *ptr,
        wchar_t *str,
        size_t size,
-       _CONST wchar_t *fmt _DOTS)
+       const wchar_t *fmt _DOTS)
 {
   int ret;
   va_list ap;
@@ -597,7 +597,7 @@ int
 _DEFUN(swprintf, (str, size, fmt),
        wchar_t *__restrict str,
        size_t size,
-       _CONST wchar_t *__restrict fmt _DOTS)
+       const wchar_t *__restrict fmt _DOTS)
 {
   int ret;
   va_list ap;
diff --git a/newlib/libc/stdio/swscanf.c b/newlib/libc/stdio/swscanf.c
index d52d826e3..c8ae05b42 100644
--- a/newlib/libc/stdio/swscanf.c
+++ b/newlib/libc/stdio/swscanf.c
@@ -415,7 +415,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #ifndef _REENT_ONLY
 
 int
-swscanf (_CONST wchar_t *__restrict str, _CONST wchar_t *__restrict fmt, ...)
+swscanf (const wchar_t *__restrict str, const wchar_t *__restrict fmt, ...)
 {
   int ret;
   va_list ap;
@@ -437,7 +437,7 @@ swscanf (_CONST wchar_t *__restrict str, _CONST wchar_t *__restrict fmt, ...)
 #endif /* !_REENT_ONLY */
 
 int
-_swscanf_r (struct _reent *ptr, _CONST wchar_t *str, _CONST wchar_t *fmt, ...)
+_swscanf_r (struct _reent *ptr, const wchar_t *str, const wchar_t *fmt, ...)
 {
   int ret;
   va_list ap;
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index fbd60fc7c..d794a988e 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -89,8 +89,8 @@ static int
 _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
        struct _reent *ptr,
        char *result,
-       _CONST char *part1,
-       _CONST char *part2,
+       const char *part1,
+       const char *part2,
        int part3,
        int *part4)
 {
@@ -149,12 +149,12 @@ _DEFUN(_tmpnam_r, (p, s),
 char *
 _DEFUN(_tempnam_r, (p, dir, pfx),
        struct _reent *p,
-       _CONST char *dir,
-       _CONST char *pfx)
+       const char *dir,
+       const char *pfx)
 {
   char *filename;
   int length;
-  _CONST char *prefix = (pfx) ? pfx : "";
+  const char *prefix = (pfx) ? pfx : "";
   if (dir == NULL && (dir = getenv ("TMPDIR")) == NULL)
     dir = P_tmpdir;
 
@@ -175,8 +175,8 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
 
 char *
 _DEFUN(tempnam, (dir, pfx),
-       _CONST char *dir,
-       _CONST char *pfx)
+       const char *dir,
+       const char *pfx)
 {
   return _tempnam_r (_REENT, dir, pfx);
 }
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 29dcb1633..d574928ee 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -201,7 +201,7 @@ int
 _DEFUN(__ssputs_r, (ptr, fp, buf, len),
        struct _reent *ptr,
        FILE *fp,
-       _CONST char *buf,
+       const char *buf,
        size_t len)
 {
  register int w;
@@ -275,7 +275,7 @@ _DEFUN(__ssprint_r, (ptr, fp, uio),
  register size_t len;
  register int w;
  register struct __siov *iov;
- register _CONST char *p = NULL;
+ register const char *p = NULL;
 
  iov = uio->uio_iov;
  len = 0;
@@ -359,7 +359,7 @@ err:
 }
 #else /* !INTEGER_ONLY */
 #ifndef _FVWRITE_IN_STREAMIO
-int __ssputs_r (struct _reent *, FILE *, _CONST char *, size_t);
+int __ssputs_r (struct _reent *, FILE *, const char *, size_t);
 #endif
 int __ssprint_r (struct _reent *, FILE *, register struct __suio *);
 #endif /* !INTEGER_ONLY */
@@ -372,7 +372,7 @@ int
 _DEFUN(__sfputs_r, (ptr, fp, buf, len),
        struct _reent *ptr,
        FILE *fp,
-       _CONST char *buf,
+       const char *buf,
        size_t len)
 {
  register int i;
@@ -442,7 +442,7 @@ out:
 }
 #else /* !INTEGER_ONLY */
 #ifndef _FVWRITE_IN_STREAMIO
-int __sfputs_r (struct _reent *, FILE *, _CONST char *buf, size_t);
+int __sfputs_r (struct _reent *, FILE *, const char *buf, size_t);
 #endif
 int __sprint_r (struct _reent *, FILE *, register struct __suio *);
 #endif /* !INTEGER_ONLY */
@@ -459,7 +459,7 @@ _NOINLINE_STATIC int
 _DEFUN(__sbprintf, (rptr, fp, fmt, ap),
        struct _reent *rptr,
        register FILE *fp,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
  int ret;
@@ -644,13 +644,13 @@ _EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
 # define GROUPING 0x400 /* use grouping ("'" flag) */
 #endif
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
+int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
 
 #ifndef STRING_ONLY
 int
 _DEFUN(VFPRINTF, (fp, fmt0, ap),
        FILE * fp,
-       _CONST char *fmt0,
+       const char *fmt0,
        va_list ap)
 {
   int result;
@@ -663,7 +663,7 @@ int
 _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
        struct _reent *data,
        FILE * fp,
-       _CONST char *fmt0,
+       const char *fmt0,
        va_list ap)
 {
  register char *fmt; /* format string */
@@ -736,9 +736,9 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
  * below longer.
  */
 #define PADSIZE 16 /* pad chunk size */
- static _CONST char blanks[PADSIZE] =
+ static const char blanks[PADSIZE] =
  {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
- static _CONST char zeroes[PADSIZE] =
+ static const char zeroes[PADSIZE] =
  {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
 
 #ifdef _MB_CAPABLE
@@ -1459,9 +1459,9 @@ string:
 #ifdef _MB_CAPABLE
  if (ch == 'S' || (flags & LONGINT)) {
  mbstate_t ps;
- _CONST wchar_t *wcp;
+ const wchar_t *wcp;
 
- wcp = (_CONST wchar_t *)cp;
+ wcp = (const wchar_t *)cp;
  size = m = 0;
  memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
 
@@ -1491,7 +1491,7 @@ string:
  fp->_flags |= __SERR;
  goto error;
  }
- wcp = (_CONST wchar_t *)cp;
+ wcp = (const wchar_t *)cp;
  }
 
  if (size == 0)
@@ -1974,7 +1974,7 @@ exponent(char *p0, int exp, int fmtch)
    the STRING_ONLY/INTEGER_ONLY versions here. */
 #if defined (STRING_ONLY) && defined(INTEGER_ONLY)
 
-_CONST __CH_CLASS __chclass[256] = {
+const __CH_CLASS __chclass[256] = {
   /* 00-07 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
   /* 08-0f */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
   /* 10-17 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
@@ -2009,7 +2009,7 @@ _CONST __CH_CLASS __chclass[256] = {
   /* f8-ff */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
 };
 
-_CONST __STATE __state_table[MAX_STATE][MAX_CH_CLASS] = {
+const __STATE __state_table[MAX_STATE][MAX_CH_CLASS] = {
   /*             '0'     '1-9'     '$'     MODFR    SPEC    '.'     '*'    FLAG    OTHER */
   /* START */  { SFLAG,   WDIG,    DONE,   SMOD,    DONE,   SDOT,  VARW,   SFLAG,  DONE },
   /* SFLAG */  { SFLAG,   WDIG,    DONE,   SMOD,    DONE,   SDOT,  VARW,   SFLAG,  DONE },
@@ -2024,7 +2024,7 @@ _CONST __STATE __state_table[MAX_STATE][MAX_CH_CLASS] = {
   /* VPDIG */  { DONE,    DONE,    PREC,   DONE,    DONE,   DONE,  DONE,   DONE,   DONE },
 };
 
-_CONST __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
+const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
   /*             '0'     '1-9'     '$'     MODFR    SPEC    '.'     '*'    FLAG    OTHER */
   /* START */  { NOOP,    NUMBER,  NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
   /* SFLAG */  { NOOP,    NUMBER,  NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 3f67b2304..bf91dad35 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -226,7 +226,7 @@ typedef unsigned long long u_long_long;
 int
 _DEFUN(VFSCANF, (fp, fmt, ap),
        register FILE *fp,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -238,7 +238,7 @@ _DEFUN(VFSCANF, (fp, fmt, ap),
 int
 _DEFUN(__SVFSCANF, (fp, fmt0, ap),
        register FILE *fp,
-       char _CONST *fmt0,
+       char const *fmt0,
        va_list ap)
 {
   return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -250,7 +250,7 @@ int
 _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
        struct _reent *data,
        register FILE *fp,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   CHECK_INIT(data, fp);
@@ -405,7 +405,7 @@ int
 _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
        struct _reent *rptr,
        register FILE *fp,
-       char _CONST *fmt0,
+       char const *fmt0,
        va_list ap)
 {
   register u_char *fmt = (u_char *) fmt0;
@@ -574,7 +574,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 #endif
 
   /* `basefix' is used to avoid `if' tests in the integer scanner */
-  static _CONST short basefix[17] =
+  static const short basefix[17] =
     {10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
   /* Macro to support positional arguments */
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 7339ffe53..ad684a249 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -149,7 +149,7 @@ SEEALSO
 # undef _NO_LONGLONG
 #endif
 
-int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, _CONST wchar_t *, va_list));
+int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
 /* Defined in vfprintf.c. */
 #ifdef _FVWRITE_IN_STREAMIO
 # ifdef STRING_ONLY
@@ -164,7 +164,7 @@ int _EXFUN(__SPRINT, (struct _reent *, FILE *, register struct __suio *));
 # else
 #  define __SPRINT __sfputs_r
 # endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, _CONST char *, size_t));
+int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
 #endif
 #ifndef STRING_ONLY
 #ifdef _UNBUF_STREAM_OPT
@@ -177,7 +177,7 @@ static int
 _DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
        struct _reent *rptr,
        register FILE *fp,
-       _CONST wchar_t *fmt,
+       const wchar_t *fmt,
        va_list ap)
 {
  int ret;
@@ -368,7 +368,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
 int
 _DEFUN(VFWPRINTF, (fp, fmt0, ap),
        FILE *__restrict fp,
-       _CONST wchar_t *__restrict fmt0,
+       const wchar_t *__restrict fmt0,
        va_list ap)
 {
   int result;
@@ -381,7 +381,7 @@ int
 _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
        struct _reent *data,
        FILE * fp,
-       _CONST wchar_t *fmt0,
+       const wchar_t *fmt0,
        va_list ap)
 {
  register wchar_t *fmt; /* format string */
@@ -452,10 +452,10 @@ _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
  * below longer.
  */
 #define PADSIZE 16 /* pad chunk size */
- static _CONST wchar_t blanks[PADSIZE] =
+ static const wchar_t blanks[PADSIZE] =
  {L' ',L' ',L' ',L' ',L' ',L' ',L' ',L' ',
   L' ',L' ',L' ',L' ',L' ',L' ',L' ',L' '};
- static _CONST wchar_t zeroes[PADSIZE] =
+ static const wchar_t zeroes[PADSIZE] =
  {L'0',L'0',L'0',L'0',L'0',L'0',L'0',L'0',
   L'0',L'0',L'0',L'0',L'0',L'0',L'0',L'0'};
 
@@ -519,7 +519,7 @@ _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
 }
 #else
 #define PRINT(ptr, len) { \
- if (__SPRINT (data, fp, (_CONST char *)(ptr), (len) * sizeof (wchar_t)) == EOF) \
+ if (__SPRINT (data, fp, (const char *)(ptr), (len) * sizeof (wchar_t)) == EOF) \
  goto error; \
 }
 #define PAD(howmany, with) { \
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 715f231e3..27b06232b 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -228,7 +228,7 @@ static void * get_arg (int, va_list *, int *, void **);
 int
 _DEFUN(VFWSCANF, (fp, fmt, ap),
        register FILE *__restrict fp,
-       _CONST wchar_t *__restrict fmt,
+       const wchar_t *__restrict fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -240,7 +240,7 @@ _DEFUN(VFWSCANF, (fp, fmt, ap),
 int
 _DEFUN(__SVFWSCANF, (fp, fmt0, ap),
        register FILE *fp,
-       wchar_t _CONST *fmt0,
+       wchar_t const *fmt0,
        va_list ap)
 {
   return __SVFWSCANF_R (_REENT, fp, fmt0, ap);
@@ -252,7 +252,7 @@ int
 _DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
        struct _reent *data,
        register FILE *fp,
-       _CONST wchar_t *fmt,
+       const wchar_t *fmt,
        va_list ap)
 {
   CHECK_INIT(data, fp);
@@ -344,7 +344,7 @@ int
 _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
        struct _reent *rptr,
        register FILE *fp,
-       wchar_t _CONST *fmt0,
+       wchar_t const *fmt0,
        va_list ap)
 {
   register wchar_t *fmt = (wchar_t *) fmt0;
@@ -514,7 +514,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
 #endif
 
   /* `basefix' is used to avoid `if' tests in the integer scanner */
-  static _CONST short basefix[17] =
+  static const short basefix[17] =
     {10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
   /* Macro to support positional arguments */
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index ef2a04e2f..950009d4a 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -106,7 +106,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN(viprintf, (fmt, ap),
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -120,7 +120,7 @@ _DEFUN(viprintf, (fmt, ap),
 int
 _DEFUN(_viprintf_r, (ptr, fmt, ap),
        struct _reent *ptr,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 569fad91c..0c9b13f58 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -90,7 +90,7 @@ Supporting OS subroutines required:
 
 int
 _DEFUN(viscanf, (fmt, ap),
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -104,7 +104,7 @@ _DEFUN(viscanf, (fmt, ap),
 int
 _DEFUN(_viscanf_r, (ptr, fmt, ap),
        struct _reent *ptr,
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 26671f70c..289c46cd0 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -30,7 +30,7 @@
 
 int
 _DEFUN(vprintf, (fmt, ap),
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -49,7 +49,7 @@ _EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
 int
 _DEFUN(_vprintf_r, (ptr, fmt, ap),
        struct _reent *ptr,
-       _CONST char *__restrict fmt,
+       const char *__restrict fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index 2506919c4..260359a3e 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -31,7 +31,7 @@
 
 int
 _DEFUN(vscanf, (fmt, ap),
-       _CONST char *fmt,
+       const char *fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -50,7 +50,7 @@ _EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
 int
 _DEFUN(_vscanf_r, (ptr, fmt, ap),
        struct _reent *ptr,
-       _CONST char *__restrict fmt,
+       const char *__restrict fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index cf5120fa3..6ad0f4a8d 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -36,8 +36,8 @@
 
 int
 _DEFUN(vsiscanf, (str, fmt, ap),
-       _CONST char *str,
-       _CONST char *fmt,
+       const char *str,
+       const char *fmt,
        va_list ap)
 {
   return _vsiscanf_r (_REENT, str, fmt, ap);
@@ -48,8 +48,8 @@ _DEFUN(vsiscanf, (str, fmt, ap),
 int
 _DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
        struct _reent *ptr,
-       _CONST char *str,
-       _CONST char *fmt,
+       const char *str,
+       const char *fmt,
        va_list ap)
 {
   FILE f;
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 706461d47..87d4cd161 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -36,8 +36,8 @@
 
 int
 _DEFUN(vsscanf, (str, fmt, ap),
-       _CONST char *__restrict str,
-       _CONST char *__restrict fmt,
+       const char *__restrict str,
+       const char *__restrict fmt,
        va_list ap)
 {
   return _vsscanf_r (_REENT, str, fmt, ap);
@@ -54,8 +54,8 @@ _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
 int
 _DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
        struct _reent *ptr,
-       _CONST char *__restrict str,
-       _CONST char *__restrict fmt,
+       const char *__restrict str,
+       const char *__restrict fmt,
        va_list ap)
 {
   FILE f;
diff --git a/newlib/libc/stdio/vswscanf.c b/newlib/libc/stdio/vswscanf.c
index 0d090f021..90393f528 100644
--- a/newlib/libc/stdio/vswscanf.c
+++ b/newlib/libc/stdio/vswscanf.c
@@ -37,7 +37,7 @@
 #ifndef _REENT_ONLY
 
 int
-vswscanf (_CONST wchar_t *__restrict str, _CONST wchar_t * __restrict fmt,
+vswscanf (const wchar_t *__restrict str, const wchar_t * __restrict fmt,
   va_list ap)
 {
   return _vswscanf_r (_REENT, str, fmt, ap);
@@ -46,7 +46,7 @@ vswscanf (_CONST wchar_t *__restrict str, _CONST wchar_t * __restrict fmt,
 #endif /* !_REENT_ONLY */
 
 int
-_vswscanf_r (struct _reent *ptr, _CONST wchar_t *str, _CONST wchar_t *fmt,
+_vswscanf_r (struct _reent *ptr, const wchar_t *str, const wchar_t *fmt,
      va_list ap)
 {
   FILE f;
diff --git a/newlib/libc/stdio/vwprintf.c b/newlib/libc/stdio/vwprintf.c
index 191fb70c9..28381363e 100644
--- a/newlib/libc/stdio/vwprintf.c
+++ b/newlib/libc/stdio/vwprintf.c
@@ -27,7 +27,7 @@
 
 int
 _DEFUN(vwprintf, (fmt, ap),
-       _CONST wchar_t *__restrict fmt,
+       const wchar_t *__restrict fmt,
        va_list ap)
 {
   struct _reent *reent = _REENT;
@@ -41,7 +41,7 @@ _DEFUN(vwprintf, (fmt, ap),
 int
 _DEFUN(_vwprintf_r, (ptr, fmt, ap),
        struct _reent *ptr,
-       _CONST wchar_t *fmt,
+       const wchar_t *fmt,
        va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vwscanf.c b/newlib/libc/stdio/vwscanf.c
index e40bdede5..3945e79c8 100644
--- a/newlib/libc/stdio/vwscanf.c
+++ b/newlib/libc/stdio/vwscanf.c
@@ -32,7 +32,7 @@
 #ifndef _REENT_ONLY
 
 int
-vwscanf (_CONST wchar_t *__restrict fmt, va_list ap)
+vwscanf (const wchar_t *__restrict fmt, va_list ap)
 {
   struct _reent *reent = _REENT;
 
@@ -43,7 +43,7 @@ vwscanf (_CONST wchar_t *__restrict fmt, va_list ap)
 #endif /* !_REENT_ONLY */
 
 int
-_vwscanf_r (struct _reent *ptr, _CONST wchar_t *fmt, va_list ap)
+_vwscanf_r (struct _reent *ptr, const wchar_t *fmt, va_list ap)
 {
   _REENT_SMALL_CHECK_INIT (ptr);
   return __svfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
diff --git a/newlib/libc/stdio/wscanf.c b/newlib/libc/stdio/wscanf.c
index f953d9f81..5a7c35a08 100644
--- a/newlib/libc/stdio/wscanf.c
+++ b/newlib/libc/stdio/wscanf.c
@@ -26,7 +26,7 @@
 #ifndef _REENT_ONLY
 
 int
-wscanf(_CONST wchar_t *__restrict fmt, ...)
+wscanf(const wchar_t *__restrict fmt, ...)
 {
   int ret;
   va_list ap;
@@ -42,7 +42,7 @@ wscanf(_CONST wchar_t *__restrict fmt, ...)
 #endif /* !_REENT_ONLY */
 
 int
-_wscanf_r(struct _reent *ptr, _CONST wchar_t *fmt, ...)
+_wscanf_r(struct _reent *ptr, const wchar_t *fmt, ...)
 {
   int ret;
   va_list ap;
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index 1a238f732..f0c3c0784 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -38,7 +38,7 @@ FILE *
 _DEFUN (_fdopen64_r, (ptr, fd, mode),
  struct _reent *ptr,
  int fd,
- _CONST char *mode)
+ const char *mode)
 {
   register FILE *fp;
   int flags, oflags;
@@ -110,7 +110,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
 FILE *
 _DEFUN (fdopen64, (fd, mode),
  int fd,
- _CONST char *mode)
+ const char *mode)
 {
   return _fdopen64_r (_REENT, fd, mode);
 }
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 7edb5d807..6bdf61973 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -66,8 +66,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 FILE *
 _DEFUN (_fopen64_r, (ptr, file, mode),
  struct _reent *ptr,
- _CONST char *file,
- _CONST char *mode)
+ const char *file,
+ const char *mode)
 {
   register FILE *fp;
   register int f;
@@ -118,8 +118,8 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
 
 FILE *
 _DEFUN (fopen64, (file, mode),
- _CONST char *file,
- _CONST char *mode)
+ 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 6e42d0e3b..02995b98a 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -77,8 +77,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 FILE *
 _DEFUN (_freopen64_r, (ptr, file, mode, fp),
  struct _reent *ptr,
- _CONST char *file,
- _CONST char *mode,
+ const char *file,
+ const char *mode,
  register FILE *fp)
 {
   register int f;
@@ -248,8 +248,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
 
 FILE *
 _DEFUN (freopen64, (file, mode, fp),
- _CONST char *file,
- _CONST char *mode,
+ const char *file,
+ const char *mode,
  register FILE *fp)
 {
   return _freopen64_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index 9cfc10733..f5f6bdacf 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -44,7 +44,7 @@ int
 _DEFUN (_fsetpos64_r, (ptr, iop, pos),
  struct _reent *ptr,
  FILE * iop,
- _CONST _fpos64_t * pos)
+ const _fpos64_t * pos)
 {
   int x = _fseeko64_r (ptr, iop, (_off64_t)(*pos), SEEK_SET);
 
@@ -58,7 +58,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
 int
 _DEFUN (fsetpos64, (iop, pos),
  FILE * iop,
- _CONST _fpos64_t * pos)
+ const _fpos64_t * pos)
 {
   return _fsetpos64_r (_REENT, iop, pos);
 }
diff --git a/newlib/libc/stdlib/__exp10.c b/newlib/libc/stdlib/__exp10.c
index 4e368b830..1ff81a680 100644
--- a/newlib/libc/stdlib/__exp10.c
+++ b/newlib/libc/stdlib/__exp10.c
@@ -9,7 +9,7 @@ double
 _DEFUN (__exp10, (x),
  unsigned x)
 {
-  static _CONST double powtab[] =
+  static const double powtab[] =
   {1.0,
    10.0,
    100.0,
diff --git a/newlib/libc/stdlib/atof.c b/newlib/libc/stdlib/atof.c
index 4653d4f93..7dfbd9c55 100644
--- a/newlib/libc/stdlib/atof.c
+++ b/newlib/libc/stdlib/atof.c
@@ -58,7 +58,7 @@ Supporting OS subroutines requ