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 <jschopp@austin.ibm.com>
 
 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 <jschopp@austin.ibm.com>
 
 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 <jschopp@austin.ibm.com>
 
 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 <jschopp@austin.ibm.com>
 
 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 <jschopp@austin.ibm.com>
 
 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 <jschopp@austin.ibm.com>
 
 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 <jschopp@austin.ibm.com>
 
 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 required: <<close>>, <<fstat>>, <<isatty>>,
 
 double
 _DEFUN (atof, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtod (s, NULL);
 }
diff --git a/newlib/libc/stdlib/atoff.c b/newlib/libc/stdlib/atoff.c
index c97b78fb1..2966254be 100644
--- a/newlib/libc/stdlib/atoff.c
+++ b/newlib/libc/stdlib/atoff.c
@@ -3,7 +3,7 @@
 
 float
 _DEFUN (atoff, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtof (s, NULL);
 }
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index 936b381bd..83ad24177 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -48,7 +48,7 @@ No supporting OS subroutines are required.
 #ifndef _REENT_ONLY
 int
 _DEFUN (atoi, (s),
-	_CONST char *s)
+	const char *s)
 {
   return (int) strtol (s, NULL, 10);
 }
@@ -57,7 +57,7 @@ _DEFUN (atoi, (s),
 int
 _DEFUN (_atoi_r, (s),
 	struct _reent *ptr,
-	_CONST char *s)
+	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 8c2f5560d..cad512fbc 100644
--- a/newlib/libc/stdlib/atol.c
+++ b/newlib/libc/stdlib/atol.c
@@ -7,14 +7,14 @@
 
 #ifndef _REENT_ONLY
 long
-_DEFUN (atol, (s), _CONST char *s)
+_DEFUN (atol, (s), const char *s)
 {
   return strtol (s, NULL, 10);
 }
 #endif /* !_REENT_ONLY */
 
 long
-_DEFUN (_atol_r, (ptr, s), struct _reent *ptr, _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 d0d498349..e853f25eb 100644
--- a/newlib/libc/stdlib/atoll.c
+++ b/newlib/libc/stdlib/atoll.c
@@ -70,7 +70,7 @@ No supporting OS subroutines are required.
 #ifndef _REENT_ONLY
 long long
 _DEFUN(atoll, (str),
-       _CONST char *str)
+       const char *str)
 {
 	return strtoll(str, (char **)NULL, 10);
 }
@@ -79,7 +79,7 @@ _DEFUN(atoll, (str),
 long long
 _DEFUN(_atoll_r, (ptr, str),
        struct _reent *ptr,
-       _CONST char *str)
+       const char *str)
 {
 	return _strtoll_r(ptr, str, (char **)NULL, 10);
 }
diff --git a/newlib/libc/stdlib/gdtoa-gethex.c b/newlib/libc/stdlib/gdtoa-gethex.c
index 931ced3a7..18d9cc172 100644
--- a/newlib/libc/stdlib/gdtoa-gethex.c
+++ b/newlib/libc/stdlib/gdtoa-gethex.c
@@ -38,7 +38,7 @@ THIS SOFTWARE.
 #include "gd_qnan.h"
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG)
-_CONST unsigned char __hexdig[256]=
+const unsigned char __hexdig[256]=
 {
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -149,7 +149,7 @@ gethex (struct _reent *ptr, const char **sp, const FPI *fpi,
 	Long *exp, _Bigint **bp, int sign, locale_t loc)
 {
 	_Bigint *b;
-	_CONST unsigned char *decpt, *s0, *s, *s1;
+	const unsigned char *decpt, *s0, *s, *s1;
 	int esign, havedig, irv, k, n, nbits, up, zret;
 	__ULong L, lostbits, *x;
 	Long e, e1;
@@ -159,7 +159,7 @@ gethex (struct _reent *ptr, const char **sp, const FPI *fpi,
 	unsigned char decp_end = decimalpoint[decp_len - 1];
 
 	havedig = 0;
-	s0 = *(_CONST unsigned char **)sp + 2;
+	s0 = *(const unsigned char **)sp + 2;
 	while(s0[havedig] == '0')
 		havedig++;
 	s0 += havedig;
diff --git a/newlib/libc/stdlib/gdtoa-hexnan.c b/newlib/libc/stdlib/gdtoa-hexnan.c
index 22033d90f..fa98646f6 100644
--- a/newlib/libc/stdlib/gdtoa-hexnan.c
+++ b/newlib/libc/stdlib/gdtoa-hexnan.c
@@ -46,11 +46,11 @@ THIS SOFTWARE.
 #ifdef INFNAN_CHECK
 int
 _DEFUN (match, (sp, t),
-	_CONST char **sp,
+	const char **sp,
 	char *t)
 {
 	int c, d;
-	_CONST char *s = *sp;
+	const char *s = *sp;
 
 	while( (d = *t++) !=0) {
 		if ((c = *++s) >= 'A' && c <= 'Z')
@@ -81,12 +81,12 @@ _DEFUN (L_shift, (x, x1, i),
 
 int
 _DEFUN (hexnan, (sp, fpi, x0),
-	_CONST char **sp,
-	_CONST FPI *fpi,
+	const char **sp,
+	const FPI *fpi,
 	__ULong *x0)
 {
 	__ULong c, h, *x, *x1, *xe;
-	_CONST char *s;
+	const char *s;
 	int havedig, hd0, i, nbits;
 
 	nbits = fpi->nbits;
@@ -97,7 +97,7 @@ _DEFUN (hexnan, (sp, fpi, x0),
 	x1 = xe = x;
 	havedig = hd0 = i = 0;
 	s = *sp;
-	while((c = *(_CONST unsigned char*)++s)) {
+	while((c = *(const unsigned char*)++s)) {
 		if (!(h = __get_hexdig(c))) {
 			if (c <= ' ') {
 				if (hd0 < havedig) {
diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c
index 2d394e240..973a54732 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,
+	register const char *name,
 	int *offset)
 {
   return _findenv_r (_REENT, name, offset);
@@ -78,7 +78,7 @@ _DEFUN (_findenv, (name, offset),
 
 char *
 _DEFUN (getenv, (name),
-	_CONST char *name)
+	const char *name)
 {
   int offset;
 
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index b34c2a9b3..315d283ea 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -76,12 +76,12 @@ static char ***p_environ = &environ;
 char *
 _DEFUN (_findenv_r, (reent_ptr, name, offset),
         struct _reent *reent_ptr,
-	register _CONST char *name,
+	register const char *name,
 	int *offset)
 {
   register int len;
   register char **p;
-  _CONST char *c;
+  const char *c;
 
   ENV_LOCK;
 
@@ -121,7 +121,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset),
 char *
 _DEFUN (_getenv_r, (reent_ptr, name),
         struct _reent *reent_ptr,
-	_CONST char *name)
+	const char *name)
 {
   int offset;
 
diff --git a/newlib/libc/stdlib/ldtoa.c b/newlib/libc/stdlib/ldtoa.c
index a44413cd6..10a7537cc 100644
--- a/newlib/libc/stdlib/ldtoa.c
+++ b/newlib/libc/stdlib/ldtoa.c
@@ -61,13 +61,13 @@ typedef struct
   unsigned short equot[NI];
 } LDPARMS;
 
-static void esub (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void esub (const short unsigned int *a, const short unsigned int *b,
 		  short unsigned int *c, LDPARMS * ldp);
-static void emul (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void emul (const short unsigned int *a, const short unsigned int *b,
 		  short unsigned int *c, LDPARMS * ldp);
-static void ediv (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void ediv (const short unsigned int *a, const short unsigned int *b,
 		  short unsigned int *c, LDPARMS * ldp);
-static int ecmp (_CONST short unsigned int *a, _CONST short unsigned int *b);
+static int ecmp (const short unsigned int *a, const short unsigned int *b);
 static int enormlz (short unsigned int *x);
 static int eshift (short unsigned int *x, int sc);
 static void eshup1 (register short unsigned int *x);
@@ -77,7 +77,7 @@ static void eshdn1 (register short unsigned int *x);
 static void eshdn8 (register short unsigned int *x);
 static void eshdn6 (register short unsigned int *x);
 static void eneg (short unsigned int *x);
-static void emov (register _CONST short unsigned int *a,
+static void emov (register const short unsigned int *a,
 		  register short unsigned int *b);
 static void eclear (register short unsigned int *x);
 static void einfin (register short unsigned int *x, register LDPARMS * ldp);
@@ -111,24 +111,24 @@ static void e113toe (short unsigned int *pe, short unsigned int *y,
 
 #if NE == 10
 /* 0.0 */
-static _CONST unsigned short ezero[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
+static const unsigned short ezero[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
 /* 1.0E0 */
-static _CONST unsigned short eone[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
+static const unsigned short eone[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
   0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3fff,
 };
 
 #else
 
 /* 0.0 */
-static _CONST unsigned short ezero[NE] = {
+static const unsigned short ezero[NE] = {
   0, 0000000, 0000000, 0000000, 0000000, 0000000,
 };
 
 /* 1.0E0 */
-static _CONST unsigned short eone[NE] = {
+static const unsigned short eone[NE] = {
   0, 0000000, 0000000, 0000000, 0100000, 0x3fff,
 };
 
@@ -140,7 +140,7 @@ static _CONST unsigned short eone[NE] = {
  * messages is bound to the error codes defined
  * in mconf.h.
  */
-static _CONST char *_CONST ermsg[7] = {
+static const char *const ermsg[7] = {
   "unknown",			/* error code 0 */
   "domain",			/* error code 1 */
   "singularity",		/* et seq.      */
@@ -432,17 +432,17 @@ static int edivm (short unsigned int *den, short unsigned int *num,
 		  LDPARMS * ldp);
 static int emulm (short unsigned int *a, short unsigned int *b,
 		  LDPARMS * ldp);
-static int eisneg (_CONST short unsigned int *x);
-static int eisinf (_CONST short unsigned int *x);
-static void emovi (_CONST short unsigned int *a, short unsigned int *b);
+static int eisneg (const short unsigned int *x);
+static int eisinf (const short unsigned int *x);
+static void emovi (const short unsigned int *a, short unsigned int *b);
 static void emovo (short unsigned int *a, short unsigned int *b,
 		   LDPARMS * ldp);
 static void emovz (register short unsigned int *a,
 		   register short unsigned int *b);
 static void ecleaz (register short unsigned int *xi);
-static void eadd1 (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void eadd1 (const short unsigned int *a, const short unsigned int *b,
 		   short unsigned int *c, int subflg, LDPARMS * ldp);
-static int eisnan (_CONST short unsigned int *x);
+static int eisnan (const short unsigned int *x);
 static int eiisnan (short unsigned int *x);
 
 #ifdef DEC
@@ -473,7 +473,7 @@ eclear (register short unsigned int *x)
  */
 
 static void
-emov (register _CONST short unsigned int *a, register short unsigned int *b)
+emov (register const short unsigned int *a, register short unsigned int *b)
 {
   register int i;
 
@@ -506,7 +506,7 @@ eneg (short unsigned int *x)
  * else return zero.
  */
 static int
-eisneg (_CONST short unsigned int *x)
+eisneg (const short unsigned int *x)
 {
 
 #ifdef NANS
@@ -524,7 +524,7 @@ eisneg (_CONST short unsigned int *x)
  * else return zero.
  */
 static int
-eisinf (_CONST short unsigned int *x)
+eisinf (const short unsigned int *x)
 {
 
   if ((x[NE - 1] & 0x7fff) == 0x7fff)
@@ -542,7 +542,7 @@ eisinf (_CONST short unsigned int *x)
 /* Check if e-type number is not a number.
  */
 static int
-eisnan (_CONST short unsigned int *x)
+eisnan (const short unsigned int *x)
 {
 
 #ifdef NANS
@@ -612,9 +612,9 @@ einfin (register short unsigned int *x, register LDPARMS * ldp)
  * converting it to internal format.
  */
 static void
-emovi (_CONST short unsigned int *a, short unsigned int *b)
+emovi (const short unsigned int *a, short unsigned int *b)
 {
-  register _CONST unsigned short *p;
+  register const unsigned short *p;
   register unsigned short *q;
   int i;
 
@@ -1421,7 +1421,7 @@ mdfin:
 */
 
 static void
-esub (_CONST short unsigned int *a, _CONST short unsigned int *b,
+esub (const short unsigned int *a, const short unsigned int *b,
       short unsigned int *c, LDPARMS * ldp)
 {
 
@@ -1452,7 +1452,7 @@ esub (_CONST short unsigned int *a, _CONST short unsigned int *b,
 
 
 static void
-eadd1 (_CONST short unsigned int *a, _CONST short unsigned int *b,
+eadd1 (const short unsigned int *a, const short unsigned int *b,
        short unsigned int *c, int subflg, LDPARMS * ldp)
 {
   unsigned short ai[NI], bi[NI], ci[NI];
@@ -1563,7 +1563,7 @@ done:
 ;	ediv( a, b, c, ldp );	c = b / a
 */
 static void
-ediv (_CONST short unsigned int *a, _CONST short unsigned int *b,
+ediv (const short unsigned int *a, const short unsigned int *b,
       short unsigned int *c, LDPARMS * ldp)
 {
   unsigned short ai[NI], bi[NI];
@@ -1669,7 +1669,7 @@ dnzro2:
 ;	emul( a, b, c, ldp );	c = b * a
 */
 static void
-emul (_CONST short unsigned int *a, _CONST short unsigned int *b,
+emul (const short unsigned int *a, const short unsigned int *b,
       short unsigned int *c, LDPARMS * ldp)
 {
   unsigned short ai[NI], bi[NI];
@@ -2415,7 +2415,7 @@ toe24 (short unsigned int *x, short unsigned int *y)
  *          -2 if either a or b is a NaN.
  */
 static int
-ecmp (_CONST short unsigned int *a, _CONST short unsigned int *b)
+ecmp (const short unsigned int *a, const short unsigned int *b)
 {
   unsigned short ai[NI], bi[NI];
   register unsigned short *p, *q;
@@ -2627,7 +2627,7 @@ normdn:
 #define MAXP 4096
 
 #if NE == 10
-static _CONST unsigned short etens[NTEN + 1][NE] = {
+static const unsigned short etens[NTEN + 1][NE] = {
   {0x6576, 0x4a92, 0x804a, 0x153f,
    0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,},	/* 10**4096 */
   {0x6a32, 0xce52, 0x329a, 0x28ce,
@@ -2656,7 +2656,7 @@ static _CONST unsigned short etens[NTEN + 1][NE] = {
    0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,},	/* 10**1 */
 };
 
-static _CONST unsigned short emtens[NTEN + 1][NE] = {
+static const unsigned short emtens[NTEN + 1][NE] = {
   {0x2030, 0xcffc, 0xa1c3, 0x8123,
    0x2de3, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,},	/* 10**-4096 */
   {0x8264, 0xd2cb, 0xf2ea, 0x12d4,
@@ -2685,7 +2685,7 @@ static _CONST unsigned short emtens[NTEN + 1][NE] = {
    0xcccc, 0xcccc, 0xcccc, 0xcccc, 0xcccc, 0x3ffb,},	/* 10**-1 */
 };
 #else
-static _CONST unsigned short etens[NTEN + 1][NE] = {
+static const unsigned short etens[NTEN + 1][NE] = {
   {0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,},	/* 10**4096 */
   {0xa74d, 0x5de4, 0xc53d, 0x3b5d, 0x9e8b, 0x5a92,},	/* 10**2048 */
   {0x650d, 0x0c17, 0x8175, 0x7586, 0xc976, 0x4d48,},
@@ -2701,7 +2701,7 @@ static _CONST unsigned short etens[NTEN + 1][NE] = {
   {0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,},	/* 10**1 */
 };
 
-static _CONST unsigned short emtens[NTEN + 1][NE] = {
+static const unsigned short emtens[NTEN + 1][NE] = {
   {0x2de4, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,},	/* 10**-4096 */
   {0x4925, 0x2de4, 0x3436, 0x534f, 0xceae, 0x256b,},	/* 10**-2048 */
   {0x87a6, 0xc0bd, 0xda57, 0x82a5, 0xa2a6, 0x32b5,},
@@ -2973,7 +2973,7 @@ etoasc (short unsigned int *x, char *string, int ndigits, int outformat,
 {
   long digit;
   unsigned short y[NI], t[NI], u[NI], w[NI];
-  _CONST unsigned short *p, *r, *ten;
+  const unsigned short *p, *r, *ten;
   unsigned short sign;
   int i, j, k, expon, rndsav, ndigs;
   char *s, *ss;
@@ -3328,7 +3328,7 @@ asctoeg (char *ss, short unsigned int *y, int oprec, LDPARMS * ldp)
   int k, trail, c, rndsav;
   long lexp;
   unsigned short nsign;
-  _CONST unsigned short *p;
+  const unsigned short *p;
   char *sp, *s, *lstr;
   int lenldstr;
   int mflag = 0;
@@ -3654,7 +3654,7 @@ aexit:
  *
  * efloor( x, y, ldp );
  */
-static _CONST unsigned short bmask[] = {
+static const unsigned short bmask[] = {
   0xffff,
   0xfffe,
   0xfffc,
@@ -3756,47 +3756,47 @@ eiremain (short unsigned int *den, short unsigned int *num, LDPARMS * ldp)
  */
 #ifdef MIEEE
 #if !defined(__mips)
-static _CONST unsigned short nan113[8] = {
+static const unsigned short nan113[8] = {
   0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
 };
 
-static _CONST unsigned short nan64[6] = {
+static const unsigned short nan64[6] = {
   0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
 };
-static _CONST unsigned short nan53[4] = { 0x7fff, 0xffff, 0xffff, 0xffff };
-static _CONST unsigned short nan24[2] = { 0x7fff, 0xffff };
+static const unsigned short nan53[4] = { 0x7fff, 0xffff, 0xffff, 0xffff };
+static const unsigned short nan24[2] = { 0x7fff, 0xffff };
 #elif defined(__mips_nan2008)	/* __mips */
-static _CONST unsigned short nan113[8] = { 0x7fff, 0x8000, 0, 0, 0, 0, 0, 0 };
-static _CONST unsigned short nan64[6] = { 0x7fff, 0xc000, 0, 0, 0, 0 };
-static _CONST unsigned short nan53[4] = { 0x7ff8, 0, 0, 0 };
-static _CONST unsigned short nan24[2] = { 0x7fc0, 0 };
+static const unsigned short nan113[8] = { 0x7fff, 0x8000, 0, 0, 0, 0, 0, 0 };
+static const unsigned short nan64[6] = { 0x7fff, 0xc000, 0, 0, 0, 0 };
+static const unsigned short nan53[4] = { 0x7ff8, 0, 0, 0 };
+static const unsigned short nan24[2] = { 0x7fc0, 0 };
 #else /* __mips && !__mips_nan2008 */
-static _CONST unsigned short nan113[8] = {
+static const unsigned short nan113[8] = {
   0x7fff, 0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
 };
 
-static _CONST unsigned short nan64[6] = {
+static const unsigned short nan64[6] = {
   0x7fff, 0xbfff, 0xffff, 0xffff, 0xffff, 0xffff
 };
-static _CONST unsigned short nan53[4] = { 0x7ff7, 0xffff, 0xffff, 0xffff };
-static _CONST unsigned short nan24[2] = { 0x7fbf, 0xffff };
+static const unsigned short nan53[4] = { 0x7ff7, 0xffff, 0xffff, 0xffff };
+static const unsigned short nan24[2] = { 0x7fbf, 0xffff };
 #endif /* __mips && !__mips_nan2008 */
 #else /* !MIEEE */
 #if !defined(__mips) || defined(__mips_nan2008)
-static _CONST unsigned short nan113[8] = { 0, 0, 0, 0, 0, 0, 0x8000, 0x7fff };
-static _CONST unsigned short nan64[6] = { 0, 0, 0, 0, 0xc000, 0x7fff };
-static _CONST unsigned short nan53[4] = { 0, 0, 0, 0x7ff8 };
-static _CONST unsigned short nan24[2] = { 0, 0x7fc0 };
+static const unsigned short nan113[8] = { 0, 0, 0, 0, 0, 0, 0x8000, 0x7fff };
+static const unsigned short nan64[6] = { 0, 0, 0, 0, 0xc000, 0x7fff };
+static const unsigned short nan53[4] = { 0, 0, 0, 0x7ff8 };
+static const unsigned short nan24[2] = { 0, 0x7fc0 };
 #else /* __mips && !__mips_nan2008 */
-static _CONST unsigned short nan113[8] = {
+static const unsigned short nan113[8] = {
   0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x7fff, 0x7fff
 };
 
-static _CONST unsigned short nan64[6] = {
+static const unsigned short nan64[6] = {
   0xffff, 0xffff, 0xffff, 0xffff, 0xbfff, 0x7fff
 };
-static _CONST unsigned short nan53[4] = { 0xffff, 0xffff, 0xffff, 0x7ff7 };
-static _CONST unsigned short nan24[2] = { 0xffff, 0x7fbf };
+static const unsigned short nan53[4] = { 0xffff, 0xffff, 0xffff, 0x7ff7 };
+static const unsigned short nan24[2] = { 0xffff, 0x7fbf };
 #endif /* __mips && !__mips_nan2008 */
 #endif /* !MIEEE */
 
@@ -3805,7 +3805,7 @@ static void
 enan (short unsigned int *nan, int size)
 {
   int i, n;
-  _CONST unsigned short *p;
+  const unsigned short *p;
 
   switch (size)
     {
diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c
index cb6866d50..bd1c691d9 100644
--- a/newlib/libc/stdlib/mprec.c
+++ b/newlib/libc/stdlib/mprec.c
@@ -193,7 +193,7 @@ _DEFUN (multadd, (ptr, b, m, a),
 _Bigint *
 _DEFUN (s2b, (ptr, s, nd0, nd, y9),
 	struct _reent * ptr,
-	_CONST char *s,
+	const char *s,
 	int nd0,
 	int nd,
 	__ULong y9)
@@ -424,7 +424,7 @@ _DEFUN (pow5mult,
 {
   _Bigint *b1, *p5, *p51;
   int i;
-  static _CONST int p05[3] = {5, 25, 125};
+  static const int p05[3] = {5, 25, 125};
 
   if ((i = k & 3) != 0)
     b = multadd (ptr, b, p05[i - 1], 0);
@@ -951,7 +951,7 @@ _DEFUN (ratio, (a, b), _Bigint * a, _Bigint * b)
 }
 
 
-_CONST double
+const double
   tens[] =
 {
   1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
@@ -961,16 +961,16 @@ _CONST double
 };
 
 #if !defined(_DOUBLE_IS_32BITS) && !defined(__v800)
-_CONST double bigtens[] =
+const double bigtens[] =
 {1e16, 1e32, 1e64, 1e128, 1e256};
 
-_CONST double tinytens[] =
+const double tinytens[] =
 {1e-16, 1e-32, 1e-64, 1e-128, 1e-256};
 #else
-_CONST double bigtens[] =
+const double bigtens[] =
 {1e16, 1e32};
 
-_CONST double tinytens[] =
+const double tinytens[] =
 {1e-16, 1e-32};
 #endif
 
diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index 330c3981b..a98120aa4 100644
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -401,7 +401,7 @@ _Bigint *	_EXFUN(lshift,(struct _reent *p, _Bigint *b, int k));
 int		_EXFUN(match,(const char**, char*));
 _Bigint *	_EXFUN(diff,(struct _reent *p, _Bigint *a, _Bigint *b));
 int		_EXFUN(cmp,(_Bigint *a, _Bigint *b));
-int		_EXFUN(gethex,(struct _reent *p, _CONST char **sp, _CONST struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc));
+int		_EXFUN(gethex,(struct _reent *p, const char **sp, const struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc));
 double		_EXFUN(ratio,(_Bigint *a, _Bigint *b));
 __ULong		_EXFUN(any_on,(_Bigint *b, int k));
 void		_EXFUN(copybits,(__ULong *c, int n, _Bigint *b));
@@ -419,16 +419,16 @@ int		_strtodg_l (struct _reent *p, const char *s00, char **se,
 unsigned char _EXFUN(__hexdig_fun,(unsigned char));
 #endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
 #ifdef INFNAN_CHECK
-int		_EXFUN(hexnan,(_CONST char **sp, _CONST struct FPI *fpi, __ULong *x0));
+int		_EXFUN(hexnan,(const char **sp, const struct FPI *fpi, __ULong *x0));
 #endif
 
 #define Bcopy(x,y) memcpy((char *)&x->_sign, (char *)&y->_sign, y->_wds*sizeof(__Long) + 2*sizeof(int))
 
-extern _CONST double tinytens[];
-extern _CONST double bigtens[];
-extern _CONST double tens[];
+extern const double tinytens[];
+extern const double bigtens[];
+extern const double tens[];
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG)
-extern _CONST unsigned char __hexdig[];
+extern const unsigned char __hexdig[];
 #endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
 
 
diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c
index 7e8949417..c963a3343 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,
-	_CONST char *value,
+	const char *name,
+	const char *value,
 	int rewrite)
 {
   return _setenv_r (_REENT, name, value, rewrite);
@@ -46,7 +46,7 @@ _DEFUN (setenv, (name, value, rewrite),
  */
 int
 _DEFUN (unsetenv, (name),
-        _CONST char *name)
+        const char *name)
 {
   return _unsetenv_r (_REENT, name);
 }
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index 75f21733e..b3bc1fcce 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -51,8 +51,8 @@ extern char *_findenv_r _PARAMS ((struct _reent *, const char *, int *));
 int
 _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
         struct _reent *reent_ptr,
-	_CONST char *name,
-	_CONST char *value,
+	const char *name,
+	const char *value,
 	int rewrite)
 {
   static int alloced;		/* if allocated space before */
@@ -135,7 +135,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
 int
 _DEFUN (_unsetenv_r, (reent_ptr, name),
         struct _reent *reent_ptr,
-        _CONST char *name)
+        const char *name)
 {
   register char **P;
   int offset;
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index e3c9b7f17..1abff4fe2 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -152,7 +152,7 @@ THIS SOFTWARE.
 #undef tinytens
 /* The factor of 2^106 in tinytens[4] helps us avoid setting the underflow */
 /* flag unnecessarily.  It leads to a song and dance at the end of strtod. */
-static _CONST double tinytens[] = { 1e-16, 1e-32,
+static const double tinytens[] = { 1e-16, 1e-32,
 #ifdef _DOUBLE_IS_32BITS
 				    0.0, 0.0, 0.0
 #else
@@ -243,7 +243,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
 #endif
 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, decpt, dsign,
 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-	_CONST char *s, *s0, *s1;
+	const char *s, *s0, *s1;
 	double aadj, adj;
 	U aadj1, rv, rv0;
 	Long L;
@@ -288,7 +288,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
 	if (*s == '0') {
 #ifndef NO_HEX_FP
 		{
-		static _CONST FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
+		static const FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
 		Long exp;
 		__ULong bits[2];
 		switch(s[1]) {
@@ -415,7 +415,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
 #ifdef INFNAN_CHECK
 			/* Check for Nan and Infinity */
 			__ULong bits[2];
-			static _CONST FPI fpinan =	/* only 52 explicit bits */
+			static const FPI fpinan =	/* only 52 explicit bits */
 				{ 52, 1-1023-53+1, 2046-1023-53+1, 1, SI };
 			if (!decpt)
 			 switch(c) {
@@ -1254,7 +1254,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
 double
 _DEFUN (_strtod_r, (ptr, s00, se),
 	struct _reent *ptr,
-	_CONST char *__restrict s00,
+	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, 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,
+	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 7ffa6a95d..a366680e4 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -214,7 +214,7 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
 long
 _DEFUN (_strtol_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST char *__restrict nptr,
+	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
 {
@@ -232,7 +232,7 @@ strtol_l (const char *__restrict s, char **__restrict ptr, int base,
 
 long
 _DEFUN (strtol, (s, ptr, base),
-	_CONST char *__restrict s,
+	const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 51752655a..9fc832393 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -133,7 +133,7 @@ No supporting OS subroutines are required.
  * Convert a string to a long long integer.
  */
 static long long
-_strtoll_l (struct _reent *rptr, _CONST char *__restrict nptr,
+_strtoll_l (struct _reent *rptr, const char *__restrict nptr,
 	    char **__restrict endptr, int base, locale_t loc)
 {
 	register const unsigned char *s = (const unsigned char *)nptr;
@@ -216,7 +216,7 @@ _strtoll_l (struct _reent *rptr, _CONST char *__restrict nptr,
 long long
 _DEFUN (_strtoll_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST char *__restrict nptr,
+	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
 {
@@ -234,7 +234,7 @@ strtoll_l (const char *__restrict s, char **__restrict ptr, int base,
 
 long long
 _DEFUN (strtoll, (s, ptr, base),
-	_CONST char *__restrict s,
+	const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index e18472254..5a816dab1 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -193,7 +193,7 @@ _strtoul_l (struct _reent *rptr, const char *__restrict nptr,
 unsigned long
 _DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST char *__restrict nptr,
+	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
 {
@@ -211,7 +211,7 @@ strtoul_l (const char *__restrict s, char **__restrict ptr, int base,
 
 unsigned long
 _DEFUN (strtoul, (s, ptr, base),
-	_CONST char *__restrict s,
+	const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index 4dfb28f79..0f7c9e385 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -191,7 +191,7 @@ _strtoull_l (struct _reent *rptr, const char *__restrict nptr,
 unsigned long long
 _DEFUN (_strtoull_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST char *__restrict nptr,
+	const char *__restrict nptr,
 	char **__restrict endptr,
 	int base)
 {
@@ -209,7 +209,7 @@ strtoull_l (const char *__restrict s, char **__restrict ptr, int base,
 
 unsigned long long
 _DEFUN (strtoull, (s, ptr, base),
-	_CONST char *__restrict s,
+	const char *__restrict s,
 	char **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index f172e5de9..0df7d60d3 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -53,13 +53,13 @@ Supporting OS subroutines required: <<_exit>>, <<_execve>>, <<_fork_r>>,
 #include <reent.h>
 
 #if defined (unix) || defined (__CYGWIN__)
-static int _EXFUN(do_system, (struct _reent *ptr, _CONST char *s));
+static int _EXFUN(do_system, (struct _reent *ptr, const char *s));
 #endif
 
 int
 _DEFUN(_system_r, (ptr, s),
      struct _reent *ptr,
-     _CONST char *s)
+     const char *s)
 {
 #if defined(HAVE_SYSTEM)
   return _system (s);
@@ -94,7 +94,7 @@ _DEFUN(_system_r, (ptr, s),
 
 int
 _DEFUN(system, (s),
-     _CONST char *s)
+     const char *s)
 {
   return _system_r (_REENT, s);
 }
@@ -112,7 +112,7 @@ static char ***p_environ = &environ;
 static int
 _DEFUN(do_system, (ptr, s),
      struct _reent *ptr,
-     _CONST char *s)
+     const char *s)
 {
   char *argv[4];
   int pid, status;
@@ -144,7 +144,7 @@ _DEFUN(do_system, (ptr, s),
 static int
 _DEFUN(do_system, (ptr, s),
      struct _reent *ptr,
-     _CONST char *s)
+     const char *s)
 {
   char *argv[4];
   int pid, status;
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 239f8d2c0..8a72e6fe3 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -216,7 +216,7 @@ _wcstod_l (struct _reent *ptr, const wchar_t *nptr, wchar_t **endptr,
 double
 _DEFUN (_wcstod_r, (ptr, nptr, endptr),
 	struct _reent *ptr,
-	_CONST wchar_t *nptr,
+	const wchar_t *nptr,
 	wchar_t **endptr)
 {
   return _wcstod_l (ptr, nptr, endptr, __get_current_locale ());
@@ -225,7 +225,7 @@ _DEFUN (_wcstod_r, (ptr, nptr, endptr),
 float
 _DEFUN (_wcstof_r, (ptr, nptr, endptr),
 	struct _reent *ptr,
-	_CONST wchar_t *nptr,
+	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, 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,
+	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 1f5fd4b3a..324d75ee1 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -215,7 +215,7 @@ _wcstol_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 long
 _DEFUN (_wcstol_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST wchar_t *nptr,
+	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
 {
@@ -233,7 +233,7 @@ wcstol_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 
 long
 _DEFUN (wcstol, (s, ptr, base),
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index be9500027..00db2adf0 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -215,7 +215,7 @@ _wcstoll_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 long long
 _DEFUN (_wcstoll_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST wchar_t *nptr,
+	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
 {
@@ -233,7 +233,7 @@ wcstoll_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 
 long long
 _DEFUN (wcstoll, (s, ptr, base),
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index 2470bfa71..5c54ec591 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -194,7 +194,7 @@ _wcstoul_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 unsigned long
 _DEFUN (_wcstoul_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST wchar_t *nptr,
+	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
 {
@@ -212,7 +212,7 @@ wcstoul_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 
 unsigned long
 _DEFUN (wcstoul, (s, ptr, base),
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 55ab3cae6..4724d6150 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -210,7 +210,7 @@ _wcstoull_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
 unsigned long long
 _DEFUN (_wcstoull_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr,
-	_CONST wchar_t *nptr,
+	const wchar_t *nptr,
 	wchar_t **endptr,
 	int base)
 {
@@ -228,7 +228,7 @@ wcstoull_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
 
 unsigned long long
 _DEFUN (wcstoull, (s, ptr, base),
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	wchar_t **__restrict ptr,
 	int base)
 {
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 342237742..29afe828c 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,
-	_CONST void *m2,
+	const void *m1,
+	const void *m2,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 1ad8b3e41..d6cb0c97a 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -25,7 +25,7 @@ QUICKREF
 
 void
 _DEFUN (bcopy, (b1, b2, length),
-	_CONST void *b1,
+	const void *b1,
 	void *b2,
 	size_t length)
 {
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 756bbff3e..13519b435 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,
+	const char *s,
 	int c)
 {
   return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 6e49a1c6d..b03b504c1 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -58,7 +58,7 @@ PORTABILITY
 _PTR
 _DEFUN (memccpy, (dst0, src0, endchar, len0),
 	_PTR __restrict dst0,
-	_CONST _PTR __restrict src0,
+	const _PTR __restrict src0,
 	int endchar0,
 	size_t len0)
 {
@@ -82,9 +82,9 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0),
 #else
   _PTR ptr = NULL;
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
   char endchar = endchar0 & 0xff;
 
   /* If the size is small, or either SRC or DST is unaligned,
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index a6c5556d7..9660ed383 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -63,11 +63,11 @@ QUICKREF
 
 _PTR
 _DEFUN (memchr, (src_void, c, length),
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	int c,
 	size_t length)
 {
-  _CONST unsigned char *src = (_CONST unsigned char *) src_void;
+  const unsigned char *src = (const unsigned char *) src_void;
   unsigned char d = c;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 1af9219de..37d653a26 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,
-	_CONST _PTR m2,
+	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 3d0dca209..919379053 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -46,7 +46,7 @@ QUICKREF
 _PTR
 _DEFUN (memcpy, (dst0, src0, len0),
 	_PTR __restrict dst0,
-	_CONST _PTR __restrict src0,
+	const _PTR __restrict src0,
 	size_t len0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
@@ -63,9 +63,9 @@ _DEFUN (memcpy, (dst0, src0, len0),
   return save;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If the size is small, or either SRC or DST is unaligned,
      then punt into the byte copy loop.  This should be rare.  */
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index 10a3dfd2b..e50ab587a 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -52,12 +52,12 @@ _PTR
 __inhibit_loop_to_libcall
 _DEFUN (memmove, (dst_void, src_void, length),
 	_PTR dst_void,
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	size_t length)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *dst = dst_void;
-  _CONST char *src = src_void;
+  const char *src = src_void;
 
   if (src < dst && dst < src + length)
     {
@@ -80,9 +80,9 @@ _DEFUN (memmove, (dst_void, src_void, length),
   return dst_void;
 #else
   char *dst = dst_void;
-  _CONST char *src = src_void;
+  const char *src = src_void;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   if (src < dst && dst < src + length)
     {
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 74c453b47..79cbf2350 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -45,7 +45,7 @@ PORTABILITY
 _PTR
 _DEFUN (mempcpy, (dst0, src0, len0),
 	_PTR dst0,
-	_CONST _PTR src0,
+	const _PTR src0,
 	size_t len0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
@@ -60,9 +60,9 @@ _DEFUN (mempcpy, (dst0, src0, len0),
   return dst;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If the size is small, or either SRC or DST is unaligned,
      then punt into the byte copy loop.  This should be rare.  */
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 6a2c03e4e..7a28e2733 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -63,11 +63,11 @@ QUICKREF
 
 _PTR
 _DEFUN (memrchr, (src_void, c, length),
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	int c,
 	size_t length)
 {
-  _CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1;
+  const unsigned char *src = (const unsigned char *) src_void + length - 1;
   unsigned char d = c;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 51fe8e37e..b2078dc27 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -62,10 +62,10 @@ QUICKREF
 
 _PTR
 _DEFUN (rawmemchr, (src_void, c),
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	int c)
 {
-  _CONST unsigned char *src = (_CONST unsigned char *) src_void;
+  const unsigned char *src = (const unsigned char *) src_void;
   unsigned char d = c;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index e18fcb667..0c7f153cf 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,
+	const char *s,
 	int c)
 {
   return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 5e00b24a2..3933036cc 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -55,11 +55,11 @@ QUICKREF
 char*
 _DEFUN (stpcpy, (dst, src),
 	char *__restrict dst,
-	_CONST char *__restrict src)
+	const char *__restrict src)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   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/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index 9e8a12950..69fa8515a 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -63,14 +63,14 @@ QUICKREF
 char *
 _DEFUN (stpncpy, (dst, src),
 	char *__restrict dst,
-	_CONST char *__restrict src,
+	const char *__restrict src,
 	size_t count)
 {
   char *ret = NULL;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC and DEST is aligned and count large enough, then copy words.  */
   if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 1ee8f0ebf..4a48aa69a 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -37,14 +37,14 @@ QUICKREF
 
 int
 _DEFUN (strcasecmp, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
   int d = 0;
   for ( ; ; )
     {
-      _CONST int c1 = tolower(*s1++);
-      _CONST int c2 = tolower(*s2++);
+      const int c1 = tolower(*s1++);
+      const int c2 = tolower(*s2++);
       if (((d = c1 - c2) != 0) || (c2 == '\0'))
         break;
     }
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 71ade6664..1cc5f6ed7 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -91,8 +91,8 @@ QUICKREF
  */
 char *
 _DEFUN (strcasestr, (s, find),
-	_CONST char *s,
-	_CONST char *find)
+	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 96de39ba2..ac9bb8e15 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -56,7 +56,7 @@ QUICKREF
 char *
 _DEFUN (strcat, (s1, s2),
 	char *__restrict s1,
-	_CONST char *__restrict s2)
+	const char *__restrict s2)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *s = s1;
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index f293612d5..05503d178 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -53,10 +53,10 @@ QUICKREF
 
 char *
 _DEFUN (strchr, (s1, i),
-	_CONST char *s1,
+	const char *s1,
 	int i)
 {
-  _CONST unsigned char *s = (_CONST unsigned char *)s1;
+  const unsigned char *s = (const unsigned char *)s1;
   unsigned char c = i;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 3d110b920..14fd4e2ec 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,
+	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 c117c38ff..6c1a0386d 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -53,8 +53,8 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 { 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   while (*s1 != '\0' && *s1 == *s2)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index d95a42e2b..fae999a64 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -37,8 +37,8 @@ QUICKREF
 
 int
 _DEFUN (strcoll, (a, b),
-	_CONST char *a,
-	_CONST char *b)
+	const char *a,
+	const char *b)
 
 {
   return strcmp (a, b);
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 4354472d3..3505b800a 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -54,7 +54,7 @@ QUICKREF
 char*
 _DEFUN (strcpy, (dst0, src0),
 	char *dst0,
-	_CONST char *src0)
+	const char *src0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *s = dst0;
@@ -65,9 +65,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/string/strcspn.c b/newlib/libc/string/strcspn.c
index f0e30c80c..589054bae 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -27,11 +27,11 @@ PORTABILITY
 
 size_t
 _DEFUN (strcspn, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
-  _CONST char *s = s1;
-  _CONST char *c;
+  const char *s = s1;
+  const char *c;
 
   while (*s1)
     {
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/string/strdup.c
index dbb069264..6ea2dd570 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/string/strdup.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 char *
-_DEFUN (strdup, (str), _CONST char *str)
+_DEFUN (strdup, (str), const char *str)
 {
   return _strdup_r (_REENT, str);
 }
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index 474ec9668..9cdee80f4 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -5,7 +5,7 @@
 char *
 _DEFUN (_strdup_r, (reent_ptr, str), 
         struct _reent *reent_ptr,
-        _CONST char   *str)
+        const char   *str)
 {
   size_t len = strlen (str) + 1;
   char *copy = _malloc_r (reent_ptr, len);
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index c606f3b30..2f99294af 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -44,7 +44,7 @@ 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,
-	_CONST char *src,
+	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 300ac82c1..2dffed5e3 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -42,7 +42,7 @@ 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,
-	_CONST char *src,
+	const char *src,
 	size_t siz)
 {
         register char *d = dst;
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index 2e8c09f7f..df76d5fc2 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -50,9 +50,9 @@ QUICKREF
 
 size_t
 _DEFUN (strlen, (str),
-	_CONST char *str)
+	const char *str)
 {
-  _CONST char *start = str;
+  const char *start = str;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   unsigned long *aligned_addr;
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index a30fccf81..2a6f6265d 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -38,15 +38,15 @@ QUICKREF
 
 int 
 _DEFUN (strncasecmp, (s1, s2, n),
-	_CONST char *s1,
-	_CONST char *s2,
+	const char *s1,
+	const char *s2,
 	size_t n)
 {
   int d = 0;
   for ( ; n != 0; n--)
     {
-      _CONST int c1 = tolower(*s1++);
-      _CONST int c2 = tolower(*s2++);
+      const int c1 = tolower(*s1++);
+      const int c2 = tolower(*s2++);
       if (((d = c1 - c2) != 0) || (c2 == '\0'))
         break;
     }
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index f800221c6..2411cf124 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -60,7 +60,7 @@ QUICKREF
 char *
 _DEFUN (strncat, (s1, s2, n),
 	char *__restrict s1,
-	_CONST char *__restrict s2,
+	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 98a31d32b..685d19290 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,
-	_CONST char *s2,
+	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 91b274590..abbe43bc7 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -61,12 +61,12 @@ QUICKREF
 char *
 _DEFUN (strncpy, (dst0, src0),
 	char *__restrict dst0,
-	_CONST char *__restrict src0,
+	const char *__restrict src0,
 	size_t count)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *dscan;
-  _CONST char *sscan;
+  const char *sscan;
 
   dscan = dst0;
   sscan = src0;
@@ -82,9 +82,9 @@ _DEFUN (strncpy, (dst0, src0),
   return dst0;
 #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 and DEST is aligned and count large enough, then copy words.  */
   if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index 64e9ae68e..c241ca544 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,
+	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 c8ec072fa..3c7e8ee4f 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -5,10 +5,10 @@
 char *
 _DEFUN (_strndup_r, (reent_ptr, str, n), 
         struct _reent *reent_ptr,
-        _CONST char   *str,
+        const char   *str,
         size_t n)
 {
-  _CONST char *ptr = str;
+  const char *ptr = str;
   size_t len;
   char *copy;
 
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 4978f726d..42f460fea 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -31,10 +31,10 @@ PORTABILITY
 
 size_t
 _DEFUN (strnlen, (str, n),
-	_CONST char *str,
+	const char *str,
 	size_t n)
 {
-  _CONST char *start = str;
+  const char *start = str;
 
   while (n-- > 0 && *str)
     str++;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index f589fbdac..f70efc1ea 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -26,10 +26,10 @@ PORTABILITY
 
 char *
 _DEFUN (strpbrk, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
-  _CONST char *c = s2;
+  const char *c = s2;
   if (!*s1)
     return (char *) NULL;
 
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 721bb91dc..4aafd509a 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -31,10 +31,10 @@ QUICKREF
 
 char *
 _DEFUN (strrchr, (s, i),
-	_CONST char *s,
+	const char *s,
 	int i)
 {
-  _CONST char *last = NULL;
+  const char *last = NULL;
 
   if (i)
     {
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 287da4d7e..22ccd0bf8 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -31,11 +31,11 @@ QUICKREF
 
 size_t
 _DEFUN (strspn, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
-  _CONST char *s = s1;
-  _CONST char *c;
+  const char *s = s1;
+  const char *c;
 
   while (*s1)
     {
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 94fe297e7..749edbce6 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -40,8 +40,8 @@ QUICKREF
 
 char *
 _DEFUN (strstr, (searchee, lookfor),
-	_CONST char *searchee,
-	_CONST char *lookfor)
+	const char *searchee,
+	const char *lookfor)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
 
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index 55b81b335..13c51becf 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -48,7 +48,7 @@ QUICKREF
 size_t
 _DEFUN (strxfrm, (s1, s2, n),
 	char *__restrict s1,
-	_CONST char *__restrict s2,
+	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 b08066875..1c14a4c48 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -19,7 +19,7 @@ PORTABILITY
 
 void
 _DEFUN (swab, (b1, b2, length),
-	_CONST void *b1,
+	const void *b1,
 	void *b2,
 	ssize_t length)
 {
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index 0fda226e7..942fad19c 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -28,7 +28,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcpcpy, (s1, s2),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2)
+	const wchar_t *__restrict s2)
 {
   while ((*s1++ = *s2++))
     ;
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index f643b1e43..11f4d7c1f 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -35,7 +35,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcpncpy, (dst, src, count),
 	wchar_t *__restrict dst,
-	_CONST wchar_t *__restrict src,
+	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 f23e37227..483754997 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -37,8 +37,8 @@ QUICKREF
 
 int
 _DEFUN (wcscasecmp, (s1, s2),
-	_CONST wchar_t *s1,
-	_CONST wchar_t *s2)
+	const wchar_t *s1,
+	const wchar_t *s2)
 {
   int d = 0;
   for ( ; ; )
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 900c3cc52..40b7774e5 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -63,11 +63,11 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcscat, (s1, s2),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2)
+	const wchar_t *__restrict s2)
 {
   wchar_t *p;
   wchar_t *q;
-  _CONST wchar_t *r;
+  const wchar_t *r;
 
   p = s1;
   while (*p)
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index 7590009e9..f883f5443 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -59,10 +59,10 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcschr, (s, c),
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	wchar_t c)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   do
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index f14eb5d8d..1fb35755c 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -68,8 +68,8 @@ No supporting OS subroutines are required.
  */
 int
 _DEFUN (wcscmp, (s1, s2),
-	_CONST wchar_t * s1,
-	_CONST wchar_t * s2)
+	const wchar_t * s1,
+	const wchar_t * s2)
 {
 
   while (*s1 == *s2++)
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 27a12456e..7d6b927f8 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -34,8 +34,8 @@ PORTABILITY
 
 int
 _DEFUN (wcscoll, (a, b),
-	_CONST wchar_t *a,
-	_CONST wchar_t *b)
+	const wchar_t *a,
+	const wchar_t *b)
 
 {
   return wcscmp (a, b);
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 2dff63996..679e9c543 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -59,10 +59,10 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcscpy, (s1, s2),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2)
+	const wchar_t *__restrict s2)
 {
   wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *q;
 
   *s1 = '\0';
   p = s1;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 355499699..54bca2fa7 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -57,11 +57,11 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcscspn, (s, set),
-	_CONST wchar_t * s,
-	_CONST wchar_t * set)
+	const wchar_t * s,
+	const wchar_t * set)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *p;
+  const wchar_t *q;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index 1015c4c36..dd96d3049 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -70,11 +70,11 @@ No supporting OS subroutines are required.
 size_t
 _DEFUN (wcslcat, (dst, src, siz),
 	wchar_t * dst,
-	_CONST wchar_t * src,
+	const wchar_t * src,
 	size_t siz)
 {
   wchar_t *d = dst;
-  _CONST wchar_t *s = src;
+  const wchar_t *s = src;
   size_t n = siz;
   size_t dlen;
 
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 396dda71a..a21f8c8fc 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -64,11 +64,11 @@ No supporting OS subroutines are required.
 size_t
 _DEFUN (wcslcpy, (dst, src, siz),
 	wchar_t * dst,
-	_CONST wchar_t * src,
+	const wchar_t * src,
 	size_t siz)
 {
   wchar_t *d = dst;
-  _CONST wchar_t *s = src;
+  const wchar_t *s = src;
   size_t n = siz;
 
   /* Copy as many bytes as will fit */
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index ebef17285..c92757708 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -56,9 +56,9 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcslen, (s),
-	_CONST wchar_t * s)
+	const wchar_t * s)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index 90f310158..7abb154ee 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,
-	_CONST wchar_t *s2,
+	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 57dc9031b..3c344b46e 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -64,12 +64,12 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcsncat, (s1, s2, n),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2,
+	const wchar_t *__restrict s2,
 	size_t n)
 {
   wchar_t *p;
   wchar_t *q;
-  _CONST wchar_t *r;
+  const wchar_t *r;
 
   p = s1;
   while (*p)
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 83b899d84..2dc7660f4 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,
-	_CONST wchar_t * s2,
+	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 d09b95df7..324dad3a2 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -37,7 +37,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcsncpy, (s1, s2, n),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2,
+	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 e9715e749..cc7d66e10 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -53,10 +53,10 @@ PORTABILITY
 
 size_t
 _DEFUN(wcsnlen, (s, maxlen), 
-                 _CONST wchar_t *s,
+                 const wchar_t *s,
                  size_t maxlen)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   while (*p && maxlen-- > 0)
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index b4d8230cc..ecda7affe 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -58,11 +58,11 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcspbrk, (s, set),
-	_CONST wchar_t * s,
-	_CONST wchar_t * set)
+	const wchar_t * s,
+	const wchar_t * set)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *p;
+  const wchar_t *q;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index 68f1e28b6..f12ccc202 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -61,10 +61,10 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcsrchr, (s, c),
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	wchar_t c)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 8e8ce6c69..196816821 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -57,11 +57,11 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcsspn, (s, set),
-	_CONST wchar_t * s,
-	_CONST wchar_t * set)
+	const wchar_t * s,
+	const wchar_t * set)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *p;
+  const wchar_t *q;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index 2fdec0f97..d5a031452 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -62,12 +62,12 @@ PORTABILITY
 
 wchar_t *
 _DEFUN (wcsstr, (big, little),
-	_CONST wchar_t *__restrict big,
-	_CONST wchar_t *__restrict little)
+	const wchar_t *__restrict big,
+	const wchar_t *__restrict little)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
-  _CONST wchar_t *r;
+  const wchar_t *p;
+  const wchar_t *q;
+  const wchar_t *r;
 
   if (!*little)
     {
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 3764883a9..19abfd92d 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,
+	const wchar_t *pwcs,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index 6911b21e2..78d7da566 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -38,7 +38,7 @@ PORTABILITY
 size_t
 _DEFUN (wcsxfrm, (a, b, n),
 	wchar_t *__restrict a,
-	_CONST wchar_t *__restrict b,
+	const wchar_t *__restrict b,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index acb15d0dc..a8c73a542 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -164,7 +164,7 @@ bisearch(wint_t ucs, const struct interval *table, int max)
 
 int
 _DEFUN (__wcwidth, (ucs),
-	_CONST wint_t ucs)
+	const wint_t ucs)
 {
 #ifdef _MB_CAPABLE
   /* sorted list of non-overlapping intervals of East Asian Ambiguous
@@ -330,7 +330,7 @@ _DEFUN (__wcwidth, (ucs),
 
 int     
 _DEFUN (wcwidth, (wc),
-	_CONST wchar_t wc)
+	const wchar_t wc)
 { 
   wint_t wi = wc;
 
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 2a6f8e1a4..8db2f64cc 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -64,7 +64,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wmemchr, (s, c, n),
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	wchar_t c,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index bfe1e69b4..abb9ed6ff 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,
-	_CONST wchar_t * s2,
+	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 9e4fdc517..ad1aa24bc 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -63,7 +63,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wmemcpy, (d, s, n),
 	wchar_t *__restrict d,
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	size_t n)
 {
 
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 567f55afd..22b5a987d 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -68,7 +68,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wmemmove, (d, s, n),
 	wchar_t * d,
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	size_t n)
 {
 
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index f11485262..7354e81da 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wmempcpy, (d, s, n),
 	wchar_t *__restrict d,
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	size_t n)
 {
   return (wchar_t *) mempcpy (d, s, n * sizeof (wchar_t));
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
index 9479021e3..adf607e02 100644
--- a/newlib/libc/sys/linux/getpwent.c
+++ b/newlib/libc/sys/linux/getpwent.c
@@ -4,7 +4,7 @@
 
 struct passwd *
 _DEFUN (getpwnam, (name),
-	_CONST char *name)
+	const char *name)
 {
   errno = ENOSYS;
   return NULL;
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index c2b79ad13..2db2935ed 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -9,7 +9,7 @@ ssize_t
 _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
      struct _reent *rptr,
      int fd,
-     _CONST _PTR buf,
+     const _PTR buf,
      size_t n,
      off_t off)
 {
@@ -35,7 +35,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
 ssize_t
 _DEFUN (__libc_pwrite, (fd, buf, n, off),
      int fd,
-     _CONST _PTR buf,
+     const _PTR buf,
      size_t n,
      off_t off)
 {
diff --git a/newlib/libc/sys/linux/sys/errno.h b/newlib/libc/sys/linux/sys/errno.h
index 82c84c944..86a6968fe 100644
--- a/newlib/libc/sys/linux/sys/errno.h
+++ b/newlib/libc/sys/linux/sys/errno.h
@@ -15,7 +15,7 @@
 extern int *__errno _PARAMS ((void));
 #endif
 
-extern __IMPORT _CONST char * _CONST _sys_errlist[];
+extern __IMPORT const char * const _sys_errlist[];
 extern __IMPORT int _sys_nerr;
 
 #define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/sys/phoenix/sys/errno.h b/newlib/libc/sys/phoenix/sys/errno.h
index e3ec2a40e..82aab6d0c 100644
--- a/newlib/libc/sys/phoenix/sys/errno.h
+++ b/newlib/libc/sys/phoenix/sys/errno.h
@@ -34,7 +34,7 @@ extern int *__errno _PARAMS ((void));
 #endif
 
 /* 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;
 
 #define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index 3471e893f..1a593117d 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -5,9 +5,9 @@
 
 int
 _DEFUN (execve, (name, argv, env),
-     _CONST char *name,
-     char *_CONST argv[],
-     char *_CONST env[])
+     const char *name,
+     char *const argv[],
+     char *const env[])
 {
   return _execve_r (_REENT, name, argv, env);
 }
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index afcf3559e..188040e4e 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -5,8 +5,8 @@
 
 int
 _DEFUN (link, (old, new),
-     _CONST char *old,
-     _CONST char *new)
+     const char *old,
+     const char *new)
 {
   return _link_r (_REENT, old, new);
 }
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index 4f4cd8a78..3e0287ec8 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,
+     const char *file,
      struct stat *pstat)
 {
   return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/sysunlink.c b/newlib/libc/syscalls/sysunlink.c
index 1399a80e5..06b4fc086 100644
--- a/newlib/libc/syscalls/sysunlink.c
+++ b/newlib/libc/syscalls/sysunlink.c
@@ -5,7 +5,7 @@
 
 int
 _DEFUN (unlink, (file),
-        _CONST char *file)
+        const char *file)
 {
   return _unlink_r (_REENT, file);
 }
diff --git a/newlib/libc/time/asctime.c b/newlib/libc/time/asctime.c
index b9345f581..cbecd94f1 100644
--- a/newlib/libc/time/asctime.c
+++ b/newlib/libc/time/asctime.c
@@ -49,7 +49,7 @@ ANSI C requires <<asctime>>.
 
 char *
 _DEFUN (asctime, (tim_p),
-	_CONST struct tm *tim_p)
+	const struct tm *tim_p)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index c38e32f41..93e3fc27f 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -7,13 +7,13 @@
 
 char *
 _DEFUN (asctime_r, (tim_p, result),
-	_CONST struct tm *__restrict tim_p,
+	const struct tm *__restrict tim_p,
 	char *__restrict result)
 {
-  static _CONST char day_name[7][3] = {
+  static const char day_name[7][3] = {
 	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
-  static _CONST char mon_name[12][3] = {
+  static const char mon_name[12][3] = {
 	"Jan", "Feb", "Mar", "Apr", "May", "Jun", 
 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
diff --git a/newlib/libc/time/ctime.c b/newlib/libc/time/ctime.c
index 160eb9948..f0592f469 100644
--- a/newlib/libc/time/ctime.c
+++ b/newlib/libc/time/ctime.c
@@ -38,7 +38,7 @@ ANSI C requires <<ctime>>.
 
 char *
 _DEFUN (ctime, (tim_p),
-	_CONST time_t * tim_p)
+	const time_t * tim_p)
 {
   return asctime (localtime (tim_p));
 }
diff --git a/newlib/libc/time/ctime_r.c b/newlib/libc/time/ctime_r.c
index 3546142dd..4ab0ba77d 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,
+	const time_t * tim_p,
         char * result)
 
 {
diff --git a/newlib/libc/time/gmtime.c b/newlib/libc/time/gmtime.c
index c62a212f7..e74a16157 100644
--- a/newlib/libc/time/gmtime.c
+++ b/newlib/libc/time/gmtime.c
@@ -51,7 +51,7 @@ ANSI C requires <<gmtime>>.
 
 struct tm *
 _DEFUN (gmtime, (tim_p),
-	_CONST time_t * tim_p)
+	const time_t * tim_p)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index 01f95ebf7..dcc5dd166 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -47,11 +47,11 @@
 
 struct tm *
 _DEFUN (gmtime_r, (tim_p, res),
-	_CONST time_t *__restrict tim_p,
+	const time_t *__restrict tim_p,
 	struct tm *__restrict res)
 {
   long days, rem;
-  _CONST time_t lcltime = *tim_p;
+  const time_t lcltime = *tim_p;
   int era, weekday, year;
   unsigned erayear, yearday, month, day;
   unsigned long eraday;
diff --git a/newlib/libc/time/lcltime.c b/newlib/libc/time/lcltime.c
index 0129335a5..493df80d1 100644
--- a/newlib/libc/time/lcltime.c
+++ b/newlib/libc/time/lcltime.c
@@ -44,7 +44,7 @@ ANSI C requires <<localtime>>.
 
 struct tm *
 _DEFUN (localtime, (tim_p),
-	_CONST time_t * tim_p)
+	const time_t * tim_p)
 {
   struct _reent *reent = _REENT;
 
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index 9abf683a7..3eba498c3 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -17,14 +17,14 @@
 
 struct tm *
 _DEFUN (localtime_r, (tim_p, res),
-	_CONST time_t *__restrict tim_p,
+	const time_t *__restrict tim_p,
 	struct tm *__restrict res)
 {
   long offset;
   int hours, mins, secs;
   int year;
-  __tzinfo_type *_CONST tz = __gettzinfo ();
-  _CONST int *ip;
+  __tzinfo_type *const tz = __gettzinfo ();
+  const int *ip;
 
   res = gmtime_r (tim_p, res);
 
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
index af5793af9..dd9d76666 100644
--- a/newlib/libc/time/local.h
+++ b/newlib/libc/time/local.h
@@ -21,7 +21,7 @@
 
 int         _EXFUN (__tzcalc_limits, (int __year));
 
-extern _CONST int __month_lengths[2][MONSPERYEAR];
+extern const int __month_lengths[2][MONSPERYEAR];
 
 _VOID _EXFUN(_tzset_unlocked_r, (struct _reent *));
 _VOID _EXFUN(_tzset_unlocked, (_VOID));
diff --git a/newlib/libc/time/mktime.c b/newlib/libc/time/mktime.c
index 4849ea407..1f0d9ba27 100644
--- a/newlib/libc/time/mktime.c
+++ b/newlib/libc/time/mktime.c
@@ -50,12 +50,12 @@ ANSI C requires <<mktime>>.
 #define _SEC_IN_HOUR 3600L
 #define _SEC_IN_DAY 86400L
 
-static _CONST int DAYS_IN_MONTH[12] =
+static const int DAYS_IN_MONTH[12] =
 {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
 #define _DAYS_IN_MONTH(x) ((x == 1) ? days_in_feb : DAYS_IN_MONTH[x])
 
-static _CONST int _DAYS_BEFORE_MONTH[12] =
+static const int _DAYS_BEFORE_MONTH[12] =
 {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
 #define _ISLEAP(y) (((y) % 4) == 0 && (((y) % 100) != 0 || (((y)+1900) % 400) == 0))
diff --git a/newlib/libc/time/month_lengths.c b/newlib/libc/time/month_lengths.c
index 2871802f0..03fac2f07 100644
--- a/newlib/libc/time/month_lengths.c
+++ b/newlib/libc/time/month_lengths.c
@@ -8,7 +8,7 @@
 
 #include "local.h"
 
-_CONST int __month_lengths[2][MONSPERYEAR] = {
+const int __month_lengths[2][MONSPERYEAR] = {
   {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
   {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
 } ;
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index 54df9b2e1..4ed84fb23 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -341,7 +341,7 @@ locale, hard-coding the "C" locale settings.
 #  error "YEAR_BASE < 0"
 #endif
 
-static _CONST int dname_len[7] =
+static const int dname_len[7] =
 {6, 6, 7, 9, 8, 6, 8};
 
 /* Using the tm_year, tm_wday, and tm_yday components of TIM_P, return
@@ -349,7 +349,7 @@ static _CONST int dname_len[7] =
    numbering used in "%g%G%V", avoiding overflow.  */
 static int
 _DEFUN (iso_year_adjust, (tim_p),
-	_CONST struct tm *tim_p)
+	const struct tm *tim_p)
 {
   /* Account for fact that tm_year==0 is year 1900.  */
   int leap = isleap (tim_p->tm_year + (YEAR_BASE
@@ -1434,8 +1434,8 @@ size_t
 _DEFUN (strftime, (s, maxsize, format, tim_p),
 	CHAR *__restrict s,
 	size_t maxsize,
-	_CONST CHAR *__restrict format,
-	_CONST struct tm *__restrict tim_p)
+	const CHAR *__restrict format,
+	const struct tm *__restrict tim_p)
 {
 #ifdef _WANT_C99_TIME_FORMATS
   era_info_t *era_info = NULL;
diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c
index 2ec001a1e..12b2ef469 100644
--- a/newlib/libc/time/strptime.c
+++ b/newlib/libc/time/strptime.c
@@ -45,7 +45,7 @@
 
 #define _ctloc(x) (_CurrentTimeLocale->x)
 
-static _CONST int _DAYS_BEFORE_MONTH[12] =
+static const int _DAYS_BEFORE_MONTH[12] =
 {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
 #define SET_MDAY 1
diff --git a/newlib/libc/time/tzcalc_limits.c b/newlib/libc/time/tzcalc_limits.c
index 8a0bda3da..fe785058d 100644
--- a/newlib/libc/time/tzcalc_limits.c
+++ b/newlib/libc/time/tzcalc_limits.c
@@ -16,7 +16,7 @@ _DEFUN (__tzcalc_limits, (year),
 {
   int days, year_days, years;
   int i, j;
-  __tzinfo_type *_CONST tz = __gettzinfo ();
+  __tzinfo_type *const tz = __gettzinfo ();
 
   if (year < EPOCH_YEAR)
     return 0;
@@ -44,9 +44,9 @@ _DEFUN (__tzcalc_limits, (year),
 	days = year_days + tz->__tzrule[i].d;
       else
 	{
-	  _CONST int yleap = isleap(year);
+	  const int yleap = isleap(year);
 	  int m_day, m_wday, wday_diff;
-	  _CONST int *_CONST ip = __month_lengths[yleap];
+	  const int *const ip = __month_lengths[yleap];
 
 	  days = year_days;
 
diff --git a/newlib/libc/unix/getut.c b/newlib/libc/unix/getut.c
index cf054cb46..c3a9b626c 100644
--- a/newlib/libc/unix/getut.c
+++ b/newlib/libc/unix/getut.c
@@ -31,7 +31,7 @@ endutent ()
 }
 
 void
-utmpname (_CONST char *file)
+utmpname (const char *file)
 {
   utmp_file = strdup (file);
 }
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index 2256a30ca..3bf759bd0 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -42,7 +42,7 @@ ssize_t
 _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
      struct _reent *rptr,
      int fd,
-     _CONST _PTR buf,
+     const _PTR buf,
      size_t n,
      off_t off)
 {
@@ -68,7 +68,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
 ssize_t
 _DEFUN (pwrite, (fd, buf, n, off),
      int fd,
-     _CONST _PTR buf,
+     const _PTR buf,
      size_t n,
      off_t off)
 {
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index b49dc3b8f..16d128774 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -55,22 +55,22 @@
 
 static void _EXFUN (xdrmem_destroy, (XDR *));
 static bool_t _EXFUN (xdrmem_getlong_aligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, const long *));
 static bool_t _EXFUN (xdrmem_getlong_unaligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, const long *));
 static bool_t _EXFUN (xdrmem_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrmem_putbytes, (XDR *, _CONST char *, u_int));
+static bool_t _EXFUN (xdrmem_putbytes, (XDR *, const char *, u_int));
 /* XXX: w/64-bit pointers, u_int not enough! */
 static u_int _EXFUN (xdrmem_getpos, (XDR *));
 static bool_t _EXFUN (xdrmem_setpos, (XDR *, u_int));
 static int32_t * _EXFUN (xdrmem_inline_aligned, (XDR *, u_int));
 static int32_t * _EXFUN (xdrmem_inline_unaligned, (XDR *, u_int));
 static bool_t  _EXFUN (xdrmem_getint32_aligned, (XDR *, int32_t *));
-static bool_t  _EXFUN (xdrmem_putint32_aligned, (XDR *, _CONST int32_t *));
+static bool_t  _EXFUN (xdrmem_putint32_aligned, (XDR *, const int32_t *));
 static bool_t  _EXFUN (xdrmem_getint32_unaligned, (XDR *, int32_t *));
-static bool_t  _EXFUN (xdrmem_putint32_unaligned, (XDR *, _CONST int32_t *));
+static bool_t  _EXFUN (xdrmem_putint32_unaligned, (XDR *, const int32_t *));
 
-static _CONST struct xdr_ops xdrmem_ops_aligned = {
+static const struct xdr_ops xdrmem_ops_aligned = {
   xdrmem_getlong_aligned,
   xdrmem_putlong_aligned,
   xdrmem_getbytes,
@@ -83,7 +83,7 @@ static _CONST struct xdr_ops xdrmem_ops_aligned = {
   xdrmem_putint32_aligned
 };
 
-static _CONST struct xdr_ops xdrmem_ops_unaligned = {
+static const struct xdr_ops xdrmem_ops_unaligned = {
   xdrmem_getlong_unaligned,
   xdrmem_putlong_unaligned,
   xdrmem_getbytes,
@@ -137,7 +137,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
 static bool_t
 _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
         XDR * xdrs,
-	_CONST long *lp)
+	const long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
     return FALSE;
@@ -166,7 +166,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
 static bool_t
 _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
         XDR * xdrs,
-	_CONST long *lp)
+	const long *lp)
 {
   u_int32_t l;
 
@@ -196,7 +196,7 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
 static bool_t
 _DEFUN (xdrmem_putbytes, (xdrs, addr, len),
         XDR * xdrs,
-	_CONST char *addr,
+	const char *addr,
 	u_int len)
 {
   if (xdrs->x_handy < len)
@@ -275,7 +275,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
 static bool_t
 _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
         XDR *xdrs,
-	_CONST int32_t *ip)
+	const int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
     return FALSE;
@@ -304,7 +304,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
 static bool_t
 _DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
         XDR *xdrs,
-	_CONST int32_t *ip)
+	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 ea557fa03..79358a518 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,
+        const char *format,
 	va_list ap)
 {
   if (xdr_vprintf)
@@ -49,7 +49,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
 
 void
 _DEFUN (xdr_warnx, (fmt),
-        _CONST char *fmt _DOTS)
+        const char *fmt _DOTS)
 {
   va_list ap;
   va_start (ap, fmt);
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 0caadd6d5..367c3cb64 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -73,17 +73,17 @@ enum xprt_stat
 };
 
 static bool_t _EXFUN (xdrrec_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrrec_putlong, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrrec_putlong, (XDR *, const long *));
 static bool_t _EXFUN (xdrrec_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrrec_putbytes, (XDR *, _CONST char *, u_int));
+static bool_t _EXFUN (xdrrec_putbytes, (XDR *, const char *, u_int));
 static u_int _EXFUN (xdrrec_getpos, (XDR *));
 static bool_t _EXFUN (xdrrec_setpos, (XDR *, u_int));
 static int32_t * _EXFUN (xdrrec_inline, (XDR *, u_int));
 static void _EXFUN (xdrrec_destroy, (XDR *));
 static bool_t _EXFUN (xdrrec_getint32, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrrec_putint32, (XDR *, _CONST int32_t *));
+static bool_t _EXFUN (xdrrec_putint32, (XDR *, const int32_t *));
 
-static _CONST struct xdr_ops xdrrec_ops = {
+static const struct xdr_ops xdrrec_ops = {
   xdrrec_getlong,
   xdrrec_putlong,
   xdrrec_getbytes,
@@ -290,7 +290,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
 static bool_t
 _DEFUN (xdrrec_putlong, (xdrs, lp),
         XDR * xdrs,
-	_CONST long *lp)
+	const long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
   int32_t *dest_lp = ((int32_t *) (void *) (rstrm->out_finger));
@@ -345,7 +345,7 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
 static bool_t
 _DEFUN (xdrrec_putbytes, (xdrs, addr, len),
         XDR * xdrs,
-        _CONST char *addr,
+        const char *addr,
 	u_int len)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -522,7 +522,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
 static bool_t
 _DEFUN (xdrrec_putint32, (xdrs, ip),
         XDR *xdrs,
-	_CONST int32_t *ip)
+	const int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
   int32_t *dest_ip = ((int32_t *) (void *) (rstrm->out_finger));
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 34d1e6036..fe7aaa723 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -45,7 +45,7 @@
 static bool_t
 _DEFUN (x_putlong, (xdrs, longp),
         XDR * xdrs,
-	_CONST long *longp)
+	const long *longp)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
   return TRUE;
@@ -134,7 +134,7 @@ _DEFUN (x_destroy, (xdrs),
 static bool_t
 _DEFUN (x_putint32, (xdrs, int32p),
         XDR *xdrs,
-	_CONST int32_t *int32p)
+	const int32_t *int32p)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
   return TRUE;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index 5bb4b13f1..e6513e5d0 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -52,19 +52,19 @@
 
 static void _EXFUN (xdrstdio_destroy, (XDR *));
 static bool_t _EXFUN (xdrstdio_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrstdio_putlong, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrstdio_putlong, (XDR *, const long *));
 static bool_t _EXFUN (xdrstdio_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, _CONST char *, u_int));
+static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, const char *, u_int));
 static u_int _EXFUN (xdrstdio_getpos, (XDR *));
 static bool_t _EXFUN (xdrstdio_setpos, (XDR *, u_int));
 static int32_t * _EXFUN (xdrstdio_inline, (XDR *, u_int));
 static bool_t _EXFUN (xdrstdio_getint32, (XDR*, int32_t *));
-static bool_t _EXFUN (xdrstdio_putint32, (XDR*, _CONST int32_t *));
+static bool_t _EXFUN (xdrstdio_putint32, (XDR*, const int32_t *));
 
 /*
  * Ops vector for stdio type XDR
  */
-static _CONST struct xdr_ops xdrstdio_ops = {
+static const struct xdr_ops xdrstdio_ops = {
   xdrstdio_getlong,             /* deseraialize a long int */
   xdrstdio_putlong,             /* seraialize a long int */
   xdrstdio_getbytes,            /* deserialize counted bytes */
@@ -123,7 +123,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
 static bool_t
 _DEFUN (xdrstdio_putlong, (xdrs, lp),
         XDR * xdrs,
-	_CONST long *lp)
+	const long *lp)
 {
   u_int32_t temp = htonl ((u_int32_t) * lp);
 
@@ -147,7 +147,7 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
 static bool_t
 _DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
         XDR * xdrs,
-        _CONST char *addr,
+        const char *addr,
 	u_int len)
 {
   if ((len != 0) && (fwrite (addr, (size_t) len, 1,
@@ -206,7 +206,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
 static bool_t
 _DEFUN (xdrstdio_putint32, (xdrs, ip),
         XDR *xdrs,
-	_CONST int32_t *ip)
+	const int32_t *ip)
 {
   int32_t temp = htonl (*ip);
 
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index e97dfcc62..e66117fb6 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 
 
-_CONST char *it = "<UNSET>";	/* Routine name for message routines. */
+const char *it = "<UNSET>";	/* Routine name for message routines. */
 int  errors = 0;
 
 /* Complain if condition is not true.  */
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index b25e4b963..365c4c843 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -55,10 +55,10 @@ bt();
 }
 
 
-static _CONST char *iname = "foo";
+static const char *iname = "foo";
 void 
 _DEFUN(newfunc,(string),
-       _CONST char *string)
+       const char *string)
 {
   if (strcmp(iname, string)) 
   {
diff --git a/newlib/libm/test/test.h b/newlib/libm/test/test.h
index f58fcc96d..440c3850e 100644
--- a/newlib/libm/test/test.h
+++ b/newlib/libm/test/test.h
@@ -142,4 +142,4 @@ void _EXFUN(test_iok, (int, int));
 void _EXFUN(test_eok, (int, int));
 void _EXFUN(test_sok, (char *, char*));
 void _EXFUN(test_scok, (char *, char*, int));
-void _EXFUN(newfunc,(_CONST char *));
+void _EXFUN(newfunc,(const char *));
diff --git a/winsup/cygwin/libc/strptime.cc b/winsup/cygwin/libc/strptime.cc
index 081aca385..4cd9256bc 100644
--- a/winsup/cygwin/libc/strptime.cc
+++ b/winsup/cygwin/libc/strptime.cc
@@ -68,7 +68,7 @@ __weak_alias(strptime,_strptime)
 #define ALT_O			0x02
 #define	LEGAL_ALT(x)		{ if (alt_format & ~(x)) return NULL; }
 
-static _CONST int _DAYS_BEFORE_MONTH[12] =
+static const int _DAYS_BEFORE_MONTH[12] =
 {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
 #define SET_MDAY 1
