6 files changed, 4 insertions, 6 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"