14 files changed, 24 insertions, 14 deletions
diff --git a/sysdeps/generic/strtol_l.c b/sysdeps/generic/strtol_l.c
index f6f9bd8dcf..1d750a1708 100644
--- a/sysdeps/generic/strtol_l.c
+++ b/sysdeps/generic/strtol_l.c
@@ -25,4 +25,4 @@
 extern long int ____strtol_l_internal (const char *, char **, int, int,
 				       __locale_t);
 
-#include <strtol.c>
+#include "strtol.c"
diff --git a/sysdeps/generic/strtoll.c b/sysdeps/generic/strtoll.c
index cfa98c841f..e507abb703 100644
--- a/sysdeps/generic/strtoll.c
+++ b/sysdeps/generic/strtoll.c
@@ -21,5 +21,4 @@
 
 #include <strtol.c>
 
-strong_alias (__strtoll_internal, __strtoq_internal)
 weak_alias (strtoll, strtoq)
diff --git a/sysdeps/generic/strtoul.c b/sysdeps/generic/strtoul.c
index f1e0e16667..ca0fb1fc4b 100644
--- a/sysdeps/generic/strtoul.c
+++ b/sysdeps/generic/strtoul.c
@@ -18,4 +18,4 @@
 
 #define	UNSIGNED	1
 
-#include <strtol.c>
+#include "strtol.c"
diff --git a/sysdeps/generic/strtoul_l.c b/sysdeps/generic/strtoul_l.c
index c64c0c0097..a915d365a0 100644
--- a/sysdeps/generic/strtoul_l.c
+++ b/sysdeps/generic/strtoul_l.c
@@ -25,4 +25,4 @@
 extern unsigned long int ____strtoul_l_internal (const char *, char **, int,
 						 int, __locale_t);
 
-#include <strtoul.c>
+#include "strtoul.c"
diff --git a/sysdeps/generic/strtoull.c b/sysdeps/generic/strtoull.c
index 80ccf91c5e..5ec375679d 100644
--- a/sysdeps/generic/strtoull.c
+++ b/sysdeps/generic/strtoull.c
@@ -22,6 +22,5 @@
 #include <strtoul.c>
 
 #ifdef _LIBC
-strong_alias (__strtoull_internal, __strtouq_internal)
 weak_alias (strtoull, strtouq)
 #endif
diff --git a/sysdeps/generic/wcstol_l.c b/sysdeps/generic/wcstol_l.c
index abe7a98332..a7110a1d6c 100644
--- a/sysdeps/generic/wcstol_l.c
+++ b/sysdeps/generic/wcstol_l.c
@@ -27,4 +27,4 @@
 extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int,
 				       __locale_t);
 
-#include <wcstol.c>
+#include "wcstol.c"
diff --git a/sysdeps/wordsize-64/strtol.c b/sysdeps/wordsize-64/strtol.c
index 2a18f7a642..4ffbca6bdc 100644
--- a/sysdeps/wordsize-64/strtol.c
+++ b/sysdeps/wordsize-64/strtol.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __strtoll_internal __strtoll_internal_XXX
 #define strtoll strtoll_XXX
+#define strtoq strtoq_XXX
 
 #include <sysdeps/generic/strtol.c>
 
 #undef __strtoll_internal
 #undef strtoll
+#undef strtoq
 strong_alias (__strtol_internal, __strtoll_internal)
-weak_alias (__strtoll_internal, strtoll)
+weak_alias (strtol, strtoll)
+weak_alias (strtol, strtoq)
diff --git a/sysdeps/wordsize-64/strtol_l.c b/sysdeps/wordsize-64/strtol_l.c
index a2de0247fd..a3f519f46c 100644
--- a/sysdeps/wordsize-64/strtol_l.c
+++ b/sysdeps/wordsize-64/strtol_l.c
@@ -7,4 +7,4 @@
 #undef ____strtoll_l_internal
 #undef __strtoll_l
 strong_alias (____strtol_l_internal, ____strtoll_l_internal)
-weak_alias (____strtoll_l_internal, __strtoll_l)
+weak_alias (__strtol_l, __strtoll_l)
diff --git a/sysdeps/wordsize-64/strtoul.c b/sysdeps/wordsize-64/strtoul.c
index 838474f436..0e82c4c95f 100644
--- a/sysdeps/wordsize-64/strtoul.c
+++ b/sysdeps/wordsize-64/strtoul.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __strtoull_internal __strtoull_internal_XXX
 #define strtoull strtoull_XXX
+#define strtouq strtouq_XXX
 
 #include <sysdeps/generic/strtoul.c>
 
 #undef __strtoull_internal
 #undef strtoull
+#undef strtouq
 strong_alias (__strtoul_internal, __strtoull_internal)
-weak_alias (__strtoull_internal, strtoull)
+weak_alias (strtoul, strtoull)
+weak_alias (strtoul, strtouq)
diff --git a/sysdeps/wordsize-64/strtoul_l.c b/sysdeps/wordsize-64/strtoul_l.c
index 2997afa6c2..a5908298a4 100644
--- a/sysdeps/wordsize-64/strtoul_l.c
+++ b/sysdeps/wordsize-64/strtoul_l.c
@@ -7,4 +7,4 @@
 #undef ____strtoull_l_internal
 #undef __strtoull_l
 strong_alias (____strtoul_l_internal, ____strtoull_l_internal)
-weak_alias (____strtoull_l_internal, __strtoull_l)
+weak_alias (__strtoul_l, __strtoull_l)
diff --git a/sysdeps/wordsize-64/wcstol.c b/sysdeps/wordsize-64/wcstol.c
index f7873b745b..fcfbcf36fa 100644
--- a/sysdeps/wordsize-64/wcstol.c
+++ b/sysdeps/wordsize-64/wcstol.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __wcstoll_internal __wcstoll_internal_XXX
 #define wcstoll wcstoll_XXX
+#define wcstoq wcstoq_XXX
 
 #include <sysdeps/generic/wcstol.c>
 
 #undef __wcstoll_internal
 #undef wcstoll
+#undef wcstoq
 strong_alias (__wcstol_internal, __wcstoll_internal)
-weak_alias (__wcstoll_internal, wcstoll)
+weak_alias (wcstol, wcstoll)
+weak_alias (wcstol, wcstoq)
diff --git a/sysdeps/wordsize-64/wcstol_l.c b/sysdeps/wordsize-64/wcstol_l.c
index acfd046db6..06bf40e0af 100644
--- a/sysdeps/wordsize-64/wcstol_l.c
+++ b/sysdeps/wordsize-64/wcstol_l.c
@@ -7,4 +7,4 @@
 #undef ____wcstoll_l_internal
 #undef __wcstoll_l
 strong_alias (____wcstol_l_internal, ____wcstoll_l_internal)
-weak_alias (____wcstoll_l_internal, __wcstoll_l)
+weak_alias (__wcstol_l, __wcstoll_l)
diff --git a/sysdeps/wordsize-64/wcstoul.c b/sysdeps/wordsize-64/wcstoul.c
index 235e1e3d29..a6c5fd9f52 100644
--- a/sysdeps/wordsize-64/wcstoul.c
+++ b/sysdeps/wordsize-64/wcstoul.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __wcstoull_internal __wcstoull_internal_XXX
 #define wcstoull wcstoull_XXX
+#define wcstouq wcstouq_XXX
 
 #include <sysdeps/generic/wcstoul.c>
 
 #undef __wcstoull_internal
 #undef wcstoull
+#undef wcstouq
 strong_alias (__wcstoul_internal, __wcstoull_internal)
-weak_alias (__wcstoull_internal, wcstoull)
+weak_alias (wcstoul, wcstoull)
+weak_alias (wcstoul, wcstouq)
diff --git a/sysdeps/wordsize-64/wcstoul_l.c b/sysdeps/wordsize-64/wcstoul_l.c
index 24e54dfdca..2289caf4b9 100644
--- a/sysdeps/wordsize-64/wcstoul_l.c
+++ b/sysdeps/wordsize-64/wcstoul_l.c
@@ -7,4 +7,4 @@
 #undef ____wcstoull_l_internal
 #undef __wcstoull_l
 strong_alias (____wcstoul_l_internal, ____wcstoull_l_internal)
-weak_alias (____wcstoull_l_internal, __wcstoull_l)
+weak_alias (__wcstoul_l, __wcstoull_l)