Index: lib/libgcc_s/Makefile
===================================================================
--- lib/libgcc_s/Makefile
+++ lib/libgcc_s/Makefile
@@ -52,4 +52,7 @@
 SRCS+=		s_scalbnl.c
 .endif
 
+# Remove all duplicate sources
+SRCS:=	${SRCS:O:u}
+
 .include <bsd.lib.mk>
Index: lib/libprocstat/Makefile
===================================================================
--- lib/libprocstat/Makefile
+++ lib/libprocstat/Makefile
@@ -58,9 +58,8 @@
 .if ${MK_CDDL} != "no"
 CFLAGS+=	-DLIBPROCSTAT_ZFS
 SRCS+=	zfs.c
+# Note: SOBJS and POBJS are automatically added if we add to OBJS
 OBJS+=	zfs/zfs_defs.o
-SOBJS+=	zfs/zfs_defs.pico
-POBJS+=	zfs/zfs_defs.po
 SUBDIR=	zfs
 zfs/zfs_defs.o: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o
Index: stand/userboot/userboot/Makefile
===================================================================
--- stand/userboot/userboot/Makefile
+++ stand/userboot/userboot/Makefile
@@ -20,7 +20,6 @@
 SRCS+=		bootinfo32.c
 SRCS+=		bootinfo64.c
 SRCS+=		conf.c
-SRCS+=		console.c
 SRCS+=		copy.c
 SRCS+=		devicename.c
 SRCS+=		elf32_freebsd.c