--- Libc/Libc-391/string/Makefile.inc
+++ Libc/Libc-320.1.3/string/Makefile.inc
@@ -1,20 +1,15 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.32 2002/11/18 09:50:56 ru Exp $
 
-# machine-dependent string sources
-.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc)
-.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc"
-.endif
-
-.PATH: ${.CURDIR}/string
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
 
 CFLAGS+= -I${.CURDIR}/locale
 
 .include "Makefile.fbsd_begin"
 # machine-independent string sources
-FBSDMISRCS+=bcmp.c ffs.c index.c memccpy.c memchr.c memcmp.c \
-	memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \
-	strchr.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
+FBSDMISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
+	memcpy.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \
+	strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
 	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \
 	strcasestr.c strnstr.c \
 	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
@@ -25,6 +20,11 @@
 	wmemcmp.c \
 	wmemcpy.c wmemmove.c wmemset.c
 .include "Makefile.fbsd_end"
+
+# machine-dependent string sources
+.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc"
+.endif
 
 .if ${LIB} == "c"
 .include "Makefile.fbsd_begin"
@@ -37,11 +37,8 @@
 .include "Makefile.fbsd_end"
 
 MLINKS+=strcasecmp.3 strncasecmp.3
-MLINKS+=strcasecmp.3 strcasecmp_l.3
-MLINKS+=strcasecmp.3 strncasecmp_l.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
-MLINKS+=strcoll.3 strcoll_l.3
 MLINKS+=strcpy.3 stpcpy.3
 MLINKS+=strcpy.3 strncpy.3
 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
@@ -50,11 +47,6 @@
 MLINKS+=strtok.3 strtok_r.3
 MLINKS+=strstr.3 strcasestr.3
 MLINKS+=strstr.3 strnstr.3
-MLINKS+=strstr.3 strcasestr_l.3
-MLINKS+=strxfrm.3 strxfrm_l.3
-MLINKS+=wcscoll.3 wcscoll_l.3
-MLINKS+=wcswidth.3 wcswidth_l.3
-MLINKS+=wcsxfrm.3 wcsxfrm_l.3
 MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
 	wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
 	wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \