8 files changed, 9 insertions, 1 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 2264e39..03f3316 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	scp
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH}
 LDADD=	-lssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 0f85afd..32fa7cd 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 6540575..ab4a2b4 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-add
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index c79fd24..0fbd96d 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-agent
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 99d1fb9..8140cde 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keygen
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO}
 LDADD=	-lssh -lcrypto
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 45e63d9..6c9be5e 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keyscan
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypto -lz
diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile
index 0e1166b..5fdd672 100644
--- a/secure/usr.bin/ssh-keysign/Makefile
+++ b/secure/usr.bin/ssh-keysign/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	ssh-keysign
 MAN=	ssh-keysign.8
+CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypto -lz
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 82a8d00..d9ba6a7 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -2,6 +2,7 @@
 #
 
 PROG=	ssh
+CFLAGS+=-I${SSHDIR}
 .if defined(ENABLE_SUID_SSH)
 BINMODE=4555
 .endif
@@ -21,7 +22,7 @@ DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
 
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
-CFLAGS+= -DKRB5
+CFLAGS+= -DKRB5 -DHEIMDAL
 LDADD+=	 -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
 DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
 .endif