diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index cfa335eb326cd04f3892a09d4c00cef8208a2f33..4c8afd0684b96b44ec069f907b9537d4fc2ff6d2 100644
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -302,7 +302,7 @@ _dl_load_cache_lookup (const char *name)
Â Â  char *temp;
Â Â  temp = alloca (strlen (best) + 1);
Â Â  strcpy (temp, best);
-Â  return strdup (temp);
+Â  return __strdup (temp);
Â }
Â 
Â #ifndef MAP_COPY
diff --git a/inet/rcmd.c b/inet/rcmd.c
index 8613d96764b08cc8fe3d988a0f38125a0cd54d04..b7cc7a82ba0ac1b39ccf03c589e00114b0bc79a5 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -149,7 +149,7 @@ rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser,
Â 
Â Â Â Â Â Â Â Â  if (res->ai_canonname){
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  free (ahostbuf);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ahostbuf = strdup (res->ai_canonname);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ahostbuf = __strdup (res->ai_canonname);
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  if (ahostbuf == NULL) {
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  __fxprintf(NULL, "%s",
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  _("rcmd: Cannot allocate memory\n"));
diff --git a/inet/rexec.c b/inet/rexec.c
index 24ac4b11b6d745aa53a80bd0f7bd10924246b526..43fb67bcf2c6d4fdff9e8dcd053786ab523f7aa1 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -73,7 +73,7 @@ rexec_af (char **ahost, int rport, const char *name, const char *pass,
Â 
Â Â Â Â Â Â Â Â  if (res0->ai_canonname){
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  free (ahostbuf);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ahostbuf = strdup (res0->ai_canonname);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â  ahostbuf = __strdup (res0->ai_canonname);
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  if (ahostbuf == NULL) {
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  perror ("rexec: strdup");
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  return (-1);
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index dd0db4e6b299d1339a1224c99367525c9e7c00d3..39699fe05e58d2405be0a5ac3fd9b57983608be3 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -131,6 +131,7 @@ extern int errno;
Â /* Rename the non ANSI C functions.Â  This is required by the standard
Â Â Â  because some ANSI C functions will require linking with this object
Â Â Â  file and the name space must not be polluted.Â  */
+# define strdup __strdup
Â # define getcwd __getcwd
Â # ifndef stpcpy
Â #Â  define stpcpy __stpcpy
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 2c3348ab54ff5f1d888bfa333cea0de3f4848252..e6d816120a90776ce2d5f2bb646e8ff582e4bb5a 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -124,18 +124,12 @@ _nl_find_domain (const char *dirname, char *locale,
Â Â  alias_value = _nl_expand_alias (locale);
Â Â  if (alias_value != NULL)
Â Â Â Â  {
-#if defined _LIBC || defined HAVE_STRDUP
-Â Â Â Â Â  locale = strdup (alias_value);
-Â Â Â Â Â  if (locale == NULL)
-Â Â Â Â Â Â  return NULL;
-#else
Â Â Â Â Â Â  size_t len = strlen (alias_value) + 1;
Â Â Â Â Â Â  locale = (char *) malloc (len);
Â Â Â Â Â Â  if (locale == NULL)
Â Â Â Â Â Â Â Â  return NULL;
Â 
Â Â Â Â Â Â  memcpy (locale, alias_value, len);
-#endif
Â Â Â Â  }
Â 
Â Â  /* Now we determine the single parts of the locale name.Â  First
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index 0ac11afa4ad6fa1e1037b3803a1aeabf43da63c4..6c785c9dc0326a6443852f1f38b3fca790057fa2 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -462,7 +462,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
Â Â  if (__glibc_unlikely (lia == NULL))
Â Â Â Â  return NULL;
Â 
-Â  lia->name = strdup (*namep);
+Â  lia->name = __strdup (*namep);
Â Â  if (__glibc_unlikely (lia->name == NULL))
Â Â Â Â  {
Â Â Â Â Â Â  free (lia);
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 69b314134bc6213fe92247af012fb4a07ac59a90..1c0c7fc5be41532abf22f98c89180d91b179f536 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -283,7 +283,7 @@ setlocale (int category, const char *locale)
Â Â Â Â Â Â  if (__glibc_unlikely (strchr (locale, ';') != NULL))
Â Â Â Â Â Â Â Â  {
Â Â Â Â Â Â Â Â Â Â  /* This is a composite name.Â  Make a copy and split it up.Â  */
-Â Â Â Â Â Â Â Â  locale_copy = strdup (locale);
+Â Â Â Â Â Â Â Â  locale_copy = __strdup (locale);
Â Â Â Â Â Â Â Â Â Â  if (__glibc_unlikely (locale_copy == NULL))
Â Â Â Â Â Â Â Â Â Â Â Â  {
Â Â Â Â Â Â Â Â Â Â Â Â Â Â  __libc_rwlock_unlock (__libc_setlocale_lock);
diff --git a/posix/spawn_faction_addopen.c b/posix/spawn_faction_addopen.c
index 4f37d0b8478c3c883150534922550aa13cfcac8e..6f8d3497d6333a0c04a6647154f334a93a55568e 100644
--- a/posix/spawn_faction_addopen.c
+++ b/posix/spawn_faction_addopen.c
@@ -34,7 +34,7 @@ posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
Â Â  if (!__spawn_valid_fd (fd))
Â Â Â Â  return EBADF;
Â 
-Â  char *path_copy = strdup (path);
+Â  char *path_copy = __strdup (path);
Â Â  if (path_copy == NULL)
Â Â Â Â  return ENOMEM;
Â 
diff --git a/stdlib/putenv.c b/stdlib/putenv.c
index 71b9ab1d8c40e7505868c7d0bada186d96f71ae5..c7a0a442b9d871fd442b58a144e3c49c35f5e0d8 100644
--- a/stdlib/putenv.c
+++ b/stdlib/putenv.c
@@ -60,7 +60,7 @@ putenv (char *string)
Â Â Â Â Â Â  int use_malloc = !__libc_use_alloca (name_end - string + 1);
Â Â Â Â Â Â  if (__builtin_expect (use_malloc, 0))
Â Â Â Â Â Â Â Â  {
-Â Â Â Â Â Â Â Â  name = strndup (string, name_end - string);
+Â Â Â Â Â Â Â Â  name = __strndup (string, name_end - string);
Â Â Â Â Â Â Â Â Â Â  if (name == NULL)
Â Â Â Â Â Â Â Â Â Â Â Â  return -1;
Â Â Â Â Â Â Â Â  }
diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c
index baa177eec0f1fea3306e056033be29cee42fe132..acc9b9db14fa24b4b04e4ddca7d10980e661fe88 100644
--- a/sunrpc/svc_simple.c
+++ b/sunrpc/svc_simple.c
@@ -87,7 +87,7 @@ __registerrpc (u_long prognum, u_long versnum, u_long procnum,
Â Â Â Â Â Â  transp = svcudp_create (RPC_ANYSOCK);
Â Â Â Â Â Â  if (transp == NULL)
Â Â Â Â Â Â Â Â  {
-Â Â Â Â Â Â Â Â  buf = strdup (_("couldn't create an rpc server\n"));
+Â Â Â Â Â Â Â Â  buf = __strdup (_("couldn't create an rpc server\n"));
Â Â Â Â Â Â Â Â Â Â  goto err_out;
Â Â Â Â Â Â Â Â  }
Â Â Â Â  }
@@ -103,7 +103,7 @@ __registerrpc (u_long prognum, u_long versnum, u_long procnum,
Â Â  pl = (struct proglst_ *) malloc (sizeof (struct proglst_));
Â Â  if (pl == NULL)
Â Â Â Â  {
-Â Â Â Â Â  buf = strdup (_("registerrpc: out of memory\n"));
+Â Â Â Â Â  buf = __strdup (_("registerrpc: out of memory\n"));
Â Â Â Â Â Â  goto err_out;
Â Â Â Â  }
Â Â  pl->p_progname = progname;
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 740e9555d5c836c02a329b39540fb367ee8f8a4e..24d6d471710f5db3670b94056c5a0150c4742a47 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -536,7 +536,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  }
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  else
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  namebuf = strndup (name, scope_delim - name);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  namebuf = __strndup (name, scope_delim - name);
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  if (namebuf == NULL)
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  {
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  assert (!malloc_name);
@@ -1139,7 +1139,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  malloc_canonbuf = false;
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  else
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  canon = strdup (canon);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  canon = __strdup (canon);
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  if (canon == NULL)
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  {
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  result = -EAI_MEMORY;
