Index: head/cddl/lib/libzpool/Makefile
===================================================================
--- head/cddl/lib/libzpool/Makefile	(revision 323364)
+++ head/cddl/lib/libzpool/Makefile	(revision 323365)
@@ -1,70 +1,70 @@
 # $FreeBSD$
 
 .include "${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
 
 # ZFS_COMMON_SRCS
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 # ZFS_SHARED_SRCS
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
 # KERNEL_SRCS
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
 # LIST_SRCS
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/os
 # ATOMIC_SRCS
 .if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 ATOMIC_SRCS=	opensolaris_atomic.S
 .if ${MACHINE_ARCH} != "sparc64"
 ACFLAGS+=	-Wa,--noexecstack
 .endif
 .else
 .PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern
 ATOMIC_SRCS=	opensolaris_atomic.c
 .endif
 # UNICODE_SRCS
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/unicode
 
 LIB=		zpool
 
-ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c trim_map.c
+ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} trim_map.c
 ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
 KERNEL_SRCS=	kernel.c taskq.c util.c
 LIST_SRCS=	list.c
 UNICODE_SRCS=	u8_textprep.c
 
 SRCS=		${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
 		${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
 		${UNICODE_SRCS}
 
 WARNS?=		0
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris
 CFLAGS+=	-I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+=	-I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 CFLAGS+=	-I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+=	-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+=	-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+=	-I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+=	-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
 CFLAGS+=	-I${SRCTOP}/cddl/contrib/opensolaris/head
 CFLAGS+=	-I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
 # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look
 #      into libthr private structures. That's sooo evil, but it's only for
 #      ZFS debugging tools needs.
 CFLAGS+=	-DWANTS_MUTEX_OWNED
 CFLAGS+=	-I${SRCTOP}/lib/libpthread/thread
 CFLAGS+=	-I${SRCTOP}/lib/libpthread/sys
 CFLAGS+=	-I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include
 
 LIBADD=		md pthread z nvpair avl umem
 
 # atomic.S doesn't like profiling.
 MK_PROFILE=	no
 
 CSTD=	c99
 
 # Since there are many asserts in this library, it makes no sense to compile
 # it without debugging.
 
 CFLAGS+=	-g -DDEBUG=1
 
 .include <bsd.lib.mk>
Index: head/gnu/usr.bin/binutils/libbfd/Makefile.amd64
===================================================================
--- head/gnu/usr.bin/binutils/libbfd/Makefile.amd64	(revision 323364)
+++ head/gnu/usr.bin/binutils/libbfd/Makefile.amd64	(revision 323365)
@@ -1,30 +1,29 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/Makefile.i386"
 
 #	Get the i386 VECS.
 I386_VECS:=	${VECS}
 
 DEFAULT_VECTOR=	bfd_elf64_x86_64_freebsd_vec
 
 SRCS+=	elf64-x86-64.c \
 	efi-app-x86_64.c \
-	efi-app-ia32.c \
 	elf64.c \
 	elf64-gen.c \
 	elf64-target.h \
 	pepigen.c \
 	pex64igen.c
 
 VECS=	${DEFAULT_VECTOR} \
 	bfd_elf64_x86_64_vec \
 	bfd_efi_app_x86_64_vec \
 	${I386_VECS}
 
 CLEANFILES+=	pepigen.c pex64igen.c
 
 pepigen.c: peXXigen.c
 	sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}
 
 pex64igen.c: peXXigen.c
 	sed -e s/XX/pex64/g ${.ALLSRC} > ${.TARGET}
Index: head/usr.bin/svn/lib/libsvn_client/Makefile
===================================================================
--- head/usr.bin/svn/lib/libsvn_client/Makefile	(revision 323364)
+++ head/usr.bin/svn/lib/libsvn_client/Makefile	(revision 323365)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/libsvn_client
 
 INTERNALLIB=	yes
 LIB=		svn_client
 
 SRCS=		add.c blame.c cat.c changelist.c checkout.c cleanup.c \
 		cmdline.c commit.c commit_util.c compat_providers.c copy.c \
 		copy_foreign.c ctx.c delete.c deprecated.c diff.c \
 		diff_local.c diff_summarize.c export.c externals.c import.c \
 		info.c iprops.c list.c locking_commands.c log.c merge.c \
-		mergeinfo.c mtcc.c patch.c log.c prop_commands.c \
+		mergeinfo.c mtcc.c patch.c prop_commands.c \
 		ra.c relocate.c repos_diff.c resolved.c revert.c revisions.c \
 		status.c switch.c update.c upgrade.c url.c util.c version.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
 		-I${APR}/include/arch/unix \
 		-I${APR}/include \
 		-I${.CURDIR}/../libapr_util \
 		-I${APRU}/include/private \
 		-I${APRU}/include
 
 .include <bsd.lib.mk>