diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -4,10 +4,22 @@
 LIB=	ssh
 PRIVATELIB=	true
 SHLIB_MAJOR=	5
-SRCS=	ssh_api.c ssherr.c \
-	sshbuf.c sshkey.c sshbuf-getput-basic.c \
-	sshbuf-misc.c sshbuf-getput-crypto.c krl.c bitmap.c
-SRCS+=	authfd.c authfile.c \
+
+LIBOPENSSH_SRCS=\
+	ssh_api.c \
+	ssherr.c \
+	sshbuf.c \
+	sshkey.c \
+	sshbuf-getput-basic.c \
+	sshbuf-misc.c \
+	sshbuf-getput-crypto.c \
+	krl.c \
+	bitmap.c
+
+# gss-genr.c should be in $SRCS but causes linking problems, so it is
+# compiled directly into sshd instead.
+SRCS=	${LIBOPENSSH_SRCS} \
+	authfd.c authfile.c \
 	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
 	cleanup.c \
 	compat.c fatal.c hostfile.c \
@@ -30,9 +42,6 @@
 
 PACKAGE=	ssh
 
-# gss-genr.c should be in $SRCS but causes linking problems, so it is
-# compiled directly into sshd instead.
-
 # Portability layer
 SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \
 	fmt_scaled.c freezero.c glob.c \
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,8 +1,8 @@
 .include <src.opts.mk>
 .include "${SRCTOP}/secure/ssh.mk"
 
-PROG=   sftp-server
-SRCS=   sftp-server.c sftp-common.c sftp-server-main.c
+PROG=	sftp-server
+SRCS=	sftp-common.c sftp-server.c sftp-server-main.c
 MAN=	sftp-server.8
 
 LIBADD=	ssh
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -2,7 +2,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	ssh-pkcs11-helper
-SRCS=	ssh-pkcs11.c ssh-pkcs11-helper.c
+SRCS=	ssh-pkcs11-helper.c ssh-pkcs11.c
 MAN=	ssh-pkcs11-helper.8
 
 LIBADD=	crypto ssh
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -2,7 +2,8 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	scp
-SRCS=	scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
+SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c
+SRCS=	scp.c progressmeter.c $(SFTP_CLIENT_SRCS)
 PACKAGE=	ssh
 
 LIBADD=	ssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,8 +2,8 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	sftp
-SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c sftp-usergroup.c \
-	progressmeter.c
+SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c
+SRCS=	sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS)
 PACKAGE=	ssh
 
 LIBADD=	ssh edit
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -2,7 +2,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	ssh-add
-SRCS+=	ssh-add.c ssh-sk-client.c
+SRCS=	ssh-add.c ssh-sk-client.c
 PACKAGE=	ssh
 
 LIBADD=	ssh