12 files changed, 16 insertions, 34 deletions
diff --git a/libc/string/generic/memset.c b/libc/string/generic/memset.c
index 7ae69f85d..0185ad57b 100644
--- a/libc/string/generic/memset.c
+++ b/libc/string/generic/memset.c
@@ -21,10 +21,7 @@
 
 #undef memset
 
-void attribute_hidden *__memset (dstpp, c, len)
-     void *dstpp;
-     int c;
-     size_t len;
+void attribute_hidden *__memset (void *dstpp, int c, size_t len)
 {
   long int dstp = (long int) dstpp;
 
diff --git a/libc/string/generic/strcat.c b/libc/string/generic/strcat.c
index 58bf186c1..0996f9a29 100644
--- a/libc/string/generic/strcat.c
+++ b/libc/string/generic/strcat.c
@@ -22,9 +22,7 @@
 #undef strcat
 
 /* Append SRC on the end of DEST.  */
-char attribute_hidden *__strcat (dest, src)
-     char *dest;
-     const char *src;
+char attribute_hidden *__strcat (char *dest, const char *src)
 {
   char *s1 = dest;
   const char *s2 = src;
diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c
index 06476d448..c776380e2 100644
--- a/libc/string/generic/strchr.c
+++ b/libc/string/generic/strchr.c
@@ -29,9 +29,7 @@
 #undef strchr
 
 /* Find the first occurrence of C in S.  */
-char attribute_hidden *__strchr (s, c_in)
-     const char *s;
-     int c_in;
+char attribute_hidden *__strchr (const char *s, int c_in)
 {
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c
index 07e8e03da..e42ba9763 100644
--- a/libc/string/generic/strcmp.c
+++ b/libc/string/generic/strcmp.c
@@ -26,9 +26,7 @@
 /* Compare S1 and S2, returning less than, equal to or
    greater than zero if S1 is lexicographically less than,
    equal to or greater than S2.  */
-int attribute_hidden __strcmp (p1, p2)
-     const char *p1;
-     const char *p2;
+int attribute_hidden __strcmp (const char *p1, const char *p2)
 {
   register const unsigned char *s1 = (const unsigned char *) p1;
   register const unsigned char *s2 = (const unsigned char *) p2;
diff --git a/libc/string/generic/strcpy.c b/libc/string/generic/strcpy.c
index 7ecdfc9cb..08c810f31 100644
--- a/libc/string/generic/strcpy.c
+++ b/libc/string/generic/strcpy.c
@@ -25,9 +25,7 @@
 #undef strcpy
 
 /* Copy SRC to DEST.  */
-char attribute_hidden *__strcpy (dest, src)
-     char *dest;
-     const char *src;
+char attribute_hidden *__strcpy (char *dest, const char *src)
 {
   reg_char c;
   char *__unbounded s = (char *__unbounded) CHECK_BOUNDS_LOW (src);
diff --git a/libc/string/generic/strlen.c b/libc/string/generic/strlen.c
index a7a4ec20d..aca8c2bd9 100644
--- a/libc/string/generic/strlen.c
+++ b/libc/string/generic/strlen.c
@@ -26,8 +26,7 @@
 
 /* Return the length of the null-terminated string STR.  Scan for
    the null terminator quickly by testing four bytes at a time.  */
-size_t attribute_hidden __strlen (str)
-     const char *str;
+size_t attribute_hidden __strlen (const char *str)
 {
   const char *char_ptr;
   const unsigned long int *longword_ptr;
diff --git a/libc/string/generic/strncat.c b/libc/string/generic/strncat.c
index 0cba31d2a..f35e0865b 100644
--- a/libc/string/generic/strncat.c
+++ b/libc/string/generic/strncat.c
@@ -22,10 +22,7 @@
 
 #undef strncat
 
-char attribute_hidden *__strncat (s1, s2, n)
-     char *s1;
-     const char *s2;
-     size_t n;
+char attribute_hidden *__strncat (char *s1, const char *s2, size_t n)
 {
   reg_char c;
   char *s = s1;
diff --git a/libc/string/generic/strncpy.c b/libc/string/generic/strncpy.c
index f1ae63042..a43c48502 100644
--- a/libc/string/generic/strncpy.c
+++ b/libc/string/generic/strncpy.c
@@ -21,10 +21,7 @@
 
 #undef strncpy
 
-char attribute_hidden *__strncpy (s1, s2, n)
-     char *s1;
-     const char *s2;
-     size_t n;
+char attribute_hidden *__strncpy (char *s1, const char *s2, size_t n)
 {
   reg_char c;
   char *s = s1;
diff --git a/libc/string/strdup.c b/libc/string/strdup.c
index 2bf2462fb..19c2d6ad1 100644
--- a/libc/string/strdup.c
+++ b/libc/string/strdup.c
@@ -9,8 +9,8 @@
 
 #undef Wstrlen
 #undef Wstrcpy
-#define Wstrlen __strlen
-#define Wstrcpy __strcpy
+#define Wstrlen strlen
+#define Wstrcpy strcpy
 
 #include "wstring.c"
 
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index 3f92c034d..ac86cb168 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -8,9 +8,9 @@
 #define Wstrtok_r __strtok_r
 
 #undef Wstrspn
-#define Wstrspn __strspn
+#define Wstrspn strspn
 #undef Wstrpbrk
-#define Wstrpbrk __strpbrk
+#define Wstrpbrk strpbrk
 
 #include "wstring.c"
 
diff --git a/libc/string/wcsdup.c b/libc/string/wcsdup.c
index 25043ced1..f1af0d683 100644
--- a/libc/string/wcsdup.c
+++ b/libc/string/wcsdup.c
@@ -10,8 +10,8 @@
 
 #undef Wstrlen
 #undef Wstrcpy
-#define Wstrlen __wcslen
-#define Wstrcpy __wcscpy
+#define Wstrlen wcslen
+#define Wstrcpy wcscpy
 
 #include "wstring.c"
 
diff --git a/libc/string/wcstok.c b/libc/string/wcstok.c
index 625ee65e8..2afbd9f22 100644
--- a/libc/string/wcstok.c
+++ b/libc/string/wcstok.c
@@ -9,9 +9,9 @@
 #define Wstrtok_r __wcstok
 
 #undef Wstrspn
-#define Wstrspn __wcsspn
+#define Wstrspn wcsspn
 #undef Wstrpbrk
-#define Wstrpbrk __wcspbrk
+#define Wstrpbrk wcspbrk
 
 #include "wstring.c"