diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc
index 2fbe9ca2984..338f36571f6 100644
--- a/lib/libcompiler_rt/Makefile.inc
+++ b/lib/libcompiler_rt/Makefile.inc
@@ -67,7 +67,6 @@ SRCF+=		floatunsisf
 SRCF+=		floatuntidf
 SRCF+=		floatuntisf
 SRCF+=		floatuntixf
-SRCF+=		gcc_personality_v0	# not in upstream
 SRCF+=		int_util
 SRCF+=		lshrdi3
 SRCF+=		lshrti3
diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile
index bf018e16c9e..ecffbf9cfd6 100644
--- a/lib/libgcc_eh/Makefile
+++ b/lib/libgcc_eh/Makefile
@@ -8,6 +8,7 @@ NO_PIC=
 MK_SSP=		no
 WARNS?=	2
 
+SRCS_EXC+=	int_util.c
 .include "Makefile.inc"
 
 .if ${.MAKE.LEVEL} > 0
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index 9925d156fb0..6e025921180 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -9,7 +9,6 @@ STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
 .PATH: ${COMPILERRTDIR}/lib/builtins
 .PATH: ${UNWINDSRCDIR}
 SRCS_EXC+=	gcc_personality_v0.c
-SRCS_EXC+=	int_util.c
 SRCS_EXC+=	Unwind-EHABI.cpp
 SRCS_EXC+=	Unwind-sjlj.c
 SRCS_EXC+=	UnwindLevel1-gcc-ext.c
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index 007db5a585e..2e60a7b0dc4 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -59,8 +59,6 @@ MLINKS+=libprocstat.3 procstat_close.3 \
 CFLAGS+=	-DLIBPROCSTAT_ZFS
 SRCS+=	zfs.c
 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
diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
index 7a5462bf272..a6e884be104 100644
--- a/stand/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
@@ -20,7 +20,6 @@ SRCS+=		bootinfo.c
 SRCS+=		bootinfo32.c
 SRCS+=		bootinfo64.c
 SRCS+=		conf.c
-SRCS+=		console.c
 SRCS+=		copy.c
 SRCS+=		devicename.c
 SRCS+=		elf32_freebsd.c