diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 72b94021ea14..b16cdd873f74 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -7,12 +7,12 @@ SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
 	compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \
 	log.c match.c moduli.c mpaux.c nchan.c packet.c \
 	readpass.c rsa.c tildexpand.c ttymodes.c xmalloc.c \
-	atomicio.c key.c dispatch.c kex.c mac.c uuencode.c misc.c \
-	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
-	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
+	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
+	monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
+	kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
 	entropy.c scard-opensc.c
 # Portability layer
-SRCS+=	bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
+SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
 # FreeBSD additions
 SRCS+=	version.c
 
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index fcfd989cc17b..0b6cd4f8719b 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -3,13 +3,12 @@
 
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
-	sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \
+	sshpty.c sshlogin.c servconf.c serverloop.c \
 	auth.c auth1.c auth2.c auth-options.c session.c \
 	auth-chall.c auth2-chall.c groupaccess.c \
 	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
 	auth2-none.c auth2-passwd.c auth2-pubkey.c \
-	monitor_mm.c monitor.c monitor_wrap.c monitor_fdpass.c \
-	kexdhs.c kexgexs.c \
+	monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c \
 	auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
 	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \