diff --git a/ChangeLog b/ChangeLog
index ec76080976..943ff2db41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-28  Andreas Schwab  <schwab@redhat.com>
 
+	* sysdeps/i386/i686/multiarch/strnlen-c.c (libc_hidden_def): Only
+	redefine if SHARED.
+	* sysdeps/i386/i686/multiarch/wcscmp-c.c (libc_hidden_def): Likewise.
+
 	* sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Move
 	wide char related routines to wcsmbs subdir.
 
diff --git a/sysdeps/i386/i686/multiarch/strnlen-c.c b/sysdeps/i386/i686/multiarch/strnlen-c.c
index 567af2c815..f02465d6a4 100644
--- a/sysdeps/i386/i686/multiarch/strnlen-c.c
+++ b/sysdeps/i386/i686/multiarch/strnlen-c.c
@@ -1,6 +1,6 @@
-#ifndef NOT_IN_libc
-# define STRNLEN  __strnlen_ia32
-# undef libc_hidden_builtin_def
+#define STRNLEN  __strnlen_ia32
+#ifdef SHARED
+# undef libc_hidden_def
 # define libc_hidden_def(name)  \
     __hidden_ver1 (__strnlen_ia32, __GI_strnlen, __strnlen_ia32);
 #endif
diff --git a/sysdeps/i386/i686/multiarch/wcscmp-c.c b/sysdeps/i386/i686/multiarch/wcscmp-c.c
index 9592455d0d..53cc4e9c64 100644
--- a/sysdeps/i386/i686/multiarch/wcscmp-c.c
+++ b/sysdeps/i386/i686/multiarch/wcscmp-c.c
@@ -1,7 +1,5 @@
-#ifndef  NOT_IN_libc
-
-# define WCSCMP __wcscmp_ia32
-
+#define WCSCMP __wcscmp_ia32
+#ifdef SHARED
 # undef libc_hidden_def
 # define libc_hidden_def(name) \
   __hidden_ver1 (__wcscmp_ia32, __GI_wcscmp, __wcscmp_ia32);