7 files changed, 9 insertions, 5 deletions
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c
index 6edb503e1..acfefb6dc 100644
--- a/libc/string/generic/strcmp.c
+++ b/libc/string/generic/strcmp.c
@@ -44,7 +44,7 @@ int strcmp (const char *p1, const char *p2)
 libc_hidden_def(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(strcmp,strcoll)
 libc_hidden_proto(strcoll)
+strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c
index e3cf88715..47635d817 100644
--- a/libc/string/i386/strcmp.c
+++ b/libc/string/i386/strcmp.c
@@ -55,7 +55,7 @@ int strcmp(const char *cs, const char *ct)
 libc_hidden_def(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(strcmp,strcoll)
 libc_hidden_proto(strcoll)
+strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/strcmp.c b/libc/string/strcmp.c
index 0ca95766c..4a95ab882 100644
--- a/libc/string/strcmp.c
+++ b/libc/string/strcmp.c
@@ -40,7 +40,7 @@ int Wstrcmp(register const Wchar *s1, register const Wchar *s2)
 libc_hidden_def(Wstrcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(Wstrcmp,Wstrcoll)
 libc_hidden_proto(Wstrcoll)
+strong_alias(Wstrcmp,Wstrcoll)
 libc_hidden_def(Wstrcoll)
 #endif
diff --git a/libc/string/strlcpy.c b/libc/string/strlcpy.c
index a622d0c00..e4f4c3152 100644
--- a/libc/string/strlcpy.c
+++ b/libc/string/strlcpy.c
@@ -50,8 +50,8 @@ size_t Wstrlcpy(register Wchar *__restrict dst,
 #ifndef WANT_WIDE
 libc_hidden_def(strlcpy)
 #ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(strlcpy,strxfrm)
 libc_hidden_proto(strxfrm)
+strong_alias(strlcpy,strxfrm)
 libc_hidden_def(strxfrm)
 #endif
 #else
diff --git a/libc/string/strncmp.c b/libc/string/strncmp.c
index e7caf916c..7305cbaa5 100644
--- a/libc/string/strncmp.c
+++ b/libc/string/strncmp.c
@@ -37,4 +37,6 @@ int Wstrncmp(register const Wchar *s1, register const Wchar *s2, size_t n)
 	return r;
 #endif
 }
+#ifndef WANT_WIDE
 libc_hidden_def(strncmp)
+#endif
diff --git a/libc/string/strncpy.c b/libc/string/strncpy.c
index 7c6654626..40da93dac 100644
--- a/libc/string/strncpy.c
+++ b/libc/string/strncpy.c
@@ -34,4 +34,6 @@ Wchar *Wstrncpy(Wchar * __restrict s1, register const Wchar * __restrict s2,
 	
 	return s1;
 }
+#ifndef WANT_WIDE
 libc_hidden_def(strncpy)
+#endif
diff --git a/libc/string/strrchr.c b/libc/string/strrchr.c
index 7c44a346a..8a9184f9f 100644
--- a/libc/string/strrchr.c
+++ b/libc/string/strrchr.c
@@ -27,7 +27,7 @@ Wchar *Wstrrchr(register const  Wchar *s, Wint c)
 
 	return (Wchar *) p;			/* silence the warning */
 }
-libc_hidden_def(strrchr)
 #ifndef WANT_WIDE
+libc_hidden_def(strrchr)
 strong_alias(strrchr,rindex)
 #endif