diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 47c841797020..9b1e19cf5584 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -3,11 +3,11 @@
 
 LIB=	ssh
 SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
-	cipher.c compat.c compress.c crc32.c deattack.c \
+	cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
 	hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
 	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
 	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
-	cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
+	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
 	version.c
 
 .if defined(COMPAT_GETADDRINFO)
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 56fcb91501bf..0b92493866d3 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -2,7 +2,7 @@
 #
 
 PROG=	scp
-SRCS=	scp.c scp-common.c
+SRCS=	scp.c
 
 DPADD=	${LIBSSH}
 LDADD=	-lssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 6430035a6706..41d6224a3542 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,7 +2,7 @@
 #
 
 PROG=	sftp
-SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c
+SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
 
 LDADD=	-lssh -lcrypto
 DPADD=	${LIBSSH} ${LIBCRYPTO}