updated dependencies for latest make-depend target code

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13734 dc483132-0cff-0310-8789-dd5450dbe970

14 files changed, 187 insertions, 193 deletions

diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index fad6bc4ce4..febe8c1f0a 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -74,11 +74,11 @@ secure.o: $(srcdir)/secure.c
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-cmds.o: cmds.c $(SRCTOP)/include/port-sockets.h $(SRCTOP)/appl/gssftp/arpa/ftp.h \
+cmds.o: cmds.c $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/ftp.h \
   ftp_var.h pathnames.h
 cmdtab.o: cmdtab.c ftp_var.h
 domacro.o: domacro.c ftp_var.h
-ftp.o: ftp.c $(SRCTOP)/appl/gssftp/arpa/ftp.h $(SRCTOP)/appl/gssftp/arpa/telnet.h \
+ftp.o: ftp.c $(srcdir)/../arpa/ftp.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
@@ -86,13 +86,12 @@ ftp.o: ftp.c $(SRCTOP)/appl/gssftp/arpa/ftp.h $(SRCTOP)/appl/gssftp/arpa/telnet.
   $(BUILDTOP)/include/com_err.h ftp_var.h secure.h
 getpass.o: getpass.c ftp_var.h
 glob.o: glob.c ftp_var.h
-main.o: main.c ftp_var.h $(SRCTOP)/appl/gssftp/arpa/ftp.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h
+main.o: main.c ftp_var.h $(srcdir)/../arpa/ftp.h $(SRCTOP)/include/port-sockets.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h
 radix.o: radix.c ftp_var.h
 ruserpass.o: ruserpass.c ftp_var.h
 secure.o: secure.c $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h secure.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/appl/gssftp/arpa/ftp.h
+  $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/ftp.h
 
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index dbc307dec6..5d78635300 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -79,7 +79,7 @@ vers.o: $(srcdir)/vers.c
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-ftpd.o: ftpd.c $(SRCTOP)/appl/gssftp/arpa/ftp.h $(SRCTOP)/appl/gssftp/arpa/telnet.h \
+ftpd.o: ftpd.c $(srcdir)/../arpa/ftp.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/syslog.h pathnames.h $(BUILDTOP)/include/libpty.h \
   $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
@@ -88,19 +88,18 @@ ftpd.o: ftpd.c $(SRCTOP)/appl/gssftp/arpa/ftp.h $(SRCTOP)/appl/gssftp/arpa/telne
   $(BUILDTOP)/include/krb524_err.h $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
   ftpd_var.h secure.h
-ftpcmd.o: ftpcmd.c $(SRCTOP)/appl/gssftp/arpa/ftp.h \
-  $(SRCTOP)/include/syslog.h ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h \
-  $(BUILDTOP)/include/gssapi/gssapi_generic.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/appl/gssftp/arpa/telnet.h
+ftpcmd.o: ftpcmd.c $(srcdir)/../arpa/ftp.h $(SRCTOP)/include/syslog.h \
+  ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/telnet.h
 popen.o: popen.c ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h
 vers.o: vers.c
-glob.o: $(srcdir)/../ftp/glob.c $(SRCTOP)/appl/gssftp/ftp/ftp_var.h
-radix.o: $(srcdir)/../ftp/radix.c $(SRCTOP)/appl/gssftp/ftp/ftp_var.h
+glob.o: $(srcdir)/../ftp/glob.c $(srcdir)/../ftp/ftp_var.h
+radix.o: $(srcdir)/../ftp/radix.c $(srcdir)/../ftp/ftp_var.h
 secure.o: $(srcdir)/../ftp/secure.c $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h secure.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/appl/gssftp/arpa/ftp.h
+  $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/ftp.h
 getdtablesize.o: $(srcdir)/../../bsd/getdtablesize.c
 
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index cddb131ef9..cdfb8dccc5 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -90,19 +90,19 @@ install::
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-auth.o: auth.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  encrypt.h enc-proto.h auth.h auth-proto.h misc-proto.h
-encrypt.o: encrypt.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  encrypt.h enc-proto.h misc.h misc-proto.h
+auth.o: auth.c $(srcdir)/../arpa/telnet.h encrypt.h \
+  enc-proto.h auth.h auth-proto.h misc-proto.h
+encrypt.o: encrypt.c $(srcdir)/../arpa/telnet.h encrypt.h \
+  enc-proto.h misc.h misc-proto.h
 genget.o: genget.c misc.h misc-proto.h
 misc.o: misc.c misc.h misc-proto.h auth.h auth-proto.h \
   encrypt.h enc-proto.h
 kerberos.o: kerberos.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/port-sockets.h encrypt.h enc-proto.h \
   auth.h auth-proto.h misc.h misc-proto.h
-kerberos5.o: kerberos5.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
+kerberos5.o: kerberos5.c $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
@@ -115,7 +115,7 @@ forward.o: forward.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.
   $(SRCTOP)/include/krb5/kdb.h krb5forw.h
 spx.o: spx.c misc-proto.h
 enc_des.o: enc_des.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../arpa/telnet.h \
   encrypt.h enc-proto.h key-proto.h misc-proto.h
 setenv.o: setenv.c misc-proto.h
 getent.o: getent.c gettytab.h
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index f3fcd7eede..5f73a2eb69 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -75,34 +75,34 @@ utilities.o: defines.h externs.h fdset.h general.h ring.h $(ARPA_TELNET)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-authenc.o: authenc.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  $(SRCTOP)/appl/telnet/libtelnet/encrypt.h $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h \
-  $(SRCTOP)/appl/telnet/libtelnet/misc.h $(SRCTOP)/appl/telnet/libtelnet/misc-proto.h \
-  general.h ring.h externs.h defines.h types.h
-commands.o: commands.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  general.h ring.h externs.h defines.h types.h $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h $(SRCTOP)/appl/telnet/libtelnet/misc-proto.h \
+authenc.o: authenc.c $(srcdir)/../arpa/telnet.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc.h \
+  $(srcdir)/../libtelnet/misc-proto.h general.h ring.h \
+  externs.h defines.h types.h
+commands.o: commands.c $(srcdir)/../arpa/telnet.h general.h \
+  ring.h externs.h defines.h types.h $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc-proto.h \
   $(SRCTOP)/include/fake-addrinfo.c $(SRCTOP)/include/fake-addrinfo.h \
-  $(SRCTOP)/include/port-sockets.h
-main.o: main.c $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h ring.h \
-  externs.h defines.h
-network.o: network.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  ring.h defines.h externs.h fdset.h
+  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h
+main.o: main.c $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
+  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h \
+  ring.h externs.h defines.h
+network.o: network.c $(srcdir)/../arpa/telnet.h ring.h \
+  defines.h externs.h fdset.h
 ring.o: ring.c ring.h general.h
-sys_bsd.o: sys_bsd.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  ring.h fdset.h defines.h externs.h types.h
-telnet.o: telnet.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  ring.h defines.h externs.h types.h general.h $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h $(SRCTOP)/appl/telnet/libtelnet/misc-proto.h
-terminal.o: terminal.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  ring.h externs.h types.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h
-utilities.o: utilities.c $(SRCTOP)/appl/telnet/arpa/telnet.h \
-  general.h fdset.h ring.h defines.h externs.h $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h
+sys_bsd.o: sys_bsd.c $(srcdir)/../arpa/telnet.h ring.h \
+  fdset.h defines.h externs.h types.h
+telnet.o: telnet.c $(srcdir)/../arpa/telnet.h ring.h \
+  defines.h externs.h types.h general.h $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc-proto.h
+terminal.o: terminal.c $(srcdir)/../arpa/telnet.h ring.h \
+  externs.h types.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h
+utilities.o: utilities.c $(srcdir)/../arpa/telnet.h \
+  general.h fdset.h ring.h defines.h externs.h $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h
 
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 09cfd3aed2..c3f3c6cbe0 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -85,45 +85,45 @@ utility.o: telnetd.h defs.h ext.h $(ARPA_TELNET)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-telnetd.o: telnetd.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+telnetd.o: telnetd.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h pathnames.h $(SRCTOP)/include/fake-addrinfo.c \
   $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \
   $(BUILDTOP)/include/libpty.h $(BUILDTOP)/include/com_err.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth.h $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h \
-  $(SRCTOP)/appl/telnet/libtelnet/encrypt.h $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h \
-  $(SRCTOP)/appl/telnet/libtelnet/misc-proto.h
+  $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
+  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h \
+  $(srcdir)/../libtelnet/misc-proto.h
 termio-tn.o: termio-tn.c
 termios-tn.o: termios-tn.c
-state.o: state.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+state.o: state.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h
-termstat.o: termstat.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+  $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h
+termstat.o: termstat.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h
-slc.o: slc.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+slc.o: slc.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h
-sys_term.o: sys_term.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+sys_term.o: sys_term.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h pathnames.h $(BUILDTOP)/include/com_err.h \
-  $(BUILDTOP)/include/libpty.h $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/include/k5-int.h \
+  $(BUILDTOP)/include/libpty.h $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(SRCTOP)/include/krb5/kdb.h
-utility.o: utility.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+utility.o: utility.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h $(SRCTOP)/appl/telnet/libtelnet/auth.h \
-  $(SRCTOP)/appl/telnet/libtelnet/auth-proto.h $(SRCTOP)/appl/telnet/libtelnet/encrypt.h \
-  $(SRCTOP)/appl/telnet/libtelnet/enc-proto.h
-global.o: global.c defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+  $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h
+global.o: global.c defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h
-authenc.o: authenc.c telnetd.h defs.h $(SRCTOP)/appl/telnet/arpa/telnet.h \
+authenc.o: authenc.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h $(SRCTOP)/appl/telnet/libtelnet/misc.h \
-  $(SRCTOP)/appl/telnet/libtelnet/misc-proto.h
+  $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/misc.h \
+  $(srcdir)/../libtelnet/misc-proto.h
 
diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in
index 0d5dab9216..2b2b967330 100644
--- a/src/lib/crypto/dk/Makefile.in
+++ b/src/lib/crypto/dk/Makefile.in
@@ -52,7 +52,7 @@ clean-unix:: clean-libobjs
 checksum.o: checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/etypes.h \
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../etypes.h \
   dk.h
 dk_decrypt.o: dk_decrypt.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
@@ -67,7 +67,7 @@ dk_encrypt.o: dk_encrypt.c $(SRCTOP)/include/k5-int.h \
 derive.o: derive.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h dk.h $(SRCTOP)/lib/crypto/etypes.h
+  $(SRCTOP)/include/krb5/kdb.h dk.h $(srcdir)/../etypes.h
 stringtokey.o: stringtokey.c dk.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in
index 65c0a75b05..32a3754620 100644
--- a/src/lib/crypto/enc_provider/Makefile.in
+++ b/src/lib/crypto/enc_provider/Makefile.in
@@ -37,10 +37,10 @@ clean-unix:: clean-libobjs
 des.o: des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/des/des_int.h \
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../des/des_int.h \
   enc_provider.h
 des3.o: des3.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/des/des_int.h
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../des/des_int.h
 
diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in
index 558764e775..9fa62fa3eb 100644
--- a/src/lib/crypto/hash_provider/Makefile.in
+++ b/src/lib/crypto/hash_provider/Makefile.in
@@ -41,20 +41,20 @@ hash_crc32.o: hash_crc32.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  $(SRCTOP)/lib/crypto/crc32/crc-32.h hash_provider.h
+  $(srcdir)/../crc32/crc-32.h hash_provider.h
 hash_md4.o: hash_md4.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/md4/rsa-md4.h \
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../md4/rsa-md4.h \
   hash_provider.h
 hash_md5.o: hash_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/md5/rsa-md5.h \
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../md5/rsa-md5.h \
   hash_provider.h
 hash_sha1.o: hash_sha1.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  $(SRCTOP)/lib/crypto/sha1/shs.h hash_provider.h
+  $(srcdir)/../sha1/shs.h hash_provider.h
 
diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in
index b08588c388..bad2f74e55 100644
--- a/src/lib/crypto/keyhash_provider/Makefile.in
+++ b/src/lib/crypto/keyhash_provider/Makefile.in
@@ -58,18 +58,18 @@ clean-unix:: clean-libobjs
 descbc.o: descbc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/des/des_int.h \
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../des/des_int.h \
   keyhash_provider.h
 k5_md4des.o: k5_md4des.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  $(SRCTOP)/lib/crypto/des/des_int.h $(SRCTOP)/lib/crypto/md4/rsa-md4.h \
+  $(srcdir)/../des/des_int.h $(srcdir)/../md4/rsa-md4.h \
   keyhash_provider.h
 k5_md5des.o: k5_md5des.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  $(SRCTOP)/lib/crypto/des/des_int.h $(SRCTOP)/lib/crypto/md5/rsa-md5.h \
+  $(srcdir)/../des/des_int.h $(srcdir)/../md5/rsa-md5.h \
   keyhash_provider.h
 
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index b8e1d51ade..5bbdc82a66 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -113,58 +113,58 @@ install-unix:: install-libs
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-cksum.o: cksum.c $(SRCTOP)/lib/crypto/des/des_int.h \
+cksum.o: cksum.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-des.o: des.c $(SRCTOP)/lib/crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \
+des.o: des.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   $(SRCTOP)/include/kerberosIV/des.h
-enc_dec.o: enc_dec.c $(SRCTOP)/lib/crypto/des/des_int.h \
+enc_dec.o: enc_dec.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-key_parity.o: key_parity.c $(SRCTOP)/lib/crypto/des/des_int.h \
+key_parity.o: key_parity.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-key_sched.o: key_sched.c $(SRCTOP)/lib/crypto/des/des_int.h \
+key_sched.o: key_sched.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-new_rnd_key.o: new_rnd_key.c $(SRCTOP)/lib/crypto/des/des_int.h \
+new_rnd_key.o: new_rnd_key.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-pcbc_encrypt.o: pcbc_encrypt.c $(SRCTOP)/lib/crypto/des/des_int.h \
+pcbc_encrypt.o: pcbc_encrypt.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/lib/crypto/des/f_tables.h
-quad_cksum.o: quad_cksum.c $(SRCTOP)/lib/crypto/des/des_int.h \
+  $(srcdir)/../crypto/des/f_tables.h
+quad_cksum.o: quad_cksum.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-random_key.o: random_key.c $(SRCTOP)/lib/crypto/des/des_int.h \
+random_key.o: random_key.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-read_passwd.o: read_passwd.c $(SRCTOP)/lib/crypto/des/des_int.h \
+read_passwd.o: read_passwd.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/des.h
-str_to_key.o: str_to_key.c $(SRCTOP)/lib/crypto/des/des_int.h \
+str_to_key.o: str_to_key.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
@@ -176,9 +176,9 @@ unix_time.o: unix_time.c $(SRCTOP)/include/k5-int.h \
 util.o: util.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/lib/crypto/des/des_int.h \
+  $(SRCTOP)/include/krb5/kdb.h $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/kerberosIV/des.h
-weak_key.o: weak_key.c $(SRCTOP)/lib/crypto/des/des_int.h \
+weak_key.o: weak_key.c $(srcdir)/../crypto/des/des_int.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 800d2ce58d..2a709a5ccc 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -222,220 +222,220 @@ accept_sec_context.o: accept_sec_context.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  gssapiP_krb5.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 acquire_cred.o: acquire_cred.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  gssapiP_krb5.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 add_cred.o: add_cred.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 canon_name.o: canon_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 compare_name.o: compare_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 context_time.o: context_time.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 copy_ccache.o: copy_ccache.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 delete_sec_context.o: delete_sec_context.c gssapiP_krb5.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 disp_name.o: disp_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 disp_status.o: disp_status.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 duplicate_name.o: duplicate_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 export_name.o: export_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 export_sec_context.o: export_sec_context.c gssapiP_krb5.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 get_tkt_flags.o: get_tkt_flags.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 gssapi_krb5.o: gssapi_krb5.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  gssapiP_krb5.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 import_name.o: import_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 import_sec_context.o: import_sec_context.c gssapiP_krb5.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 indicate_mechs.o: indicate_mechs.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 init_sec_context.o: init_sec_context.c gssapiP_krb5.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 inq_context.o: inq_context.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 inq_cred.o: inq_cred.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 inq_names.o: inq_names.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 k5seal.o: k5seal.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 k5unseal.o: k5unseal.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 krb5_gss_glue.o: krb5_gss_glue.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 process_context_token.o: process_context_token.c gssapiP_krb5.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 rel_cred.o: rel_cred.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 rel_oid.o: rel_oid.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 rel_name.o: rel_name.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 seal.o: seal.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 ser_sctx.o: ser_sctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h gssapiP_krb5.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(SRCTOP)/include/krb5/kdb.h gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 set_ccache.o: set_ccache.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 sign.o: sign.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 unseal.o: unseal.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 util_cksum.o: util_cksum.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 util_crypt.o: util_crypt.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  gssapiP_krb5.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 util_ctxsetup.o: util_ctxsetup.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 util_seed.o: util_seed.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 util_seqnum.o: util_seqnum.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 val_cred.o: val_cred.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 verify.o: verify.c gssapiP_krb5.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \
   gssapi_krb5.h gssapi_err_krb5.h
 wrap_size_limit.o: wrap_size_limit.c gssapiP_krb5.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/lib/gssapi/generic/gssapiP_generic.h \
-  $(SRCTOP)/lib/gssapi/generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/com_err.h $(srcdir)/../generic/gssapiP_generic.h \
+  $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
   ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h
 gssapi_err_krb5.o: gssapi_err_krb5.c $(BUILDTOP)/include/com_err.h
 
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index e333a88492..10dd753564 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -56,55 +56,54 @@ clean-unix:: clean-libobjs
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-asn1_decode.o: asn1_decode.c asn1_decode.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1_decode.o: asn1_decode.c asn1_decode.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h asn1buf.h asn1_get.h
-asn1_k_decode.o: asn1_k_decode.c asn1_k_decode.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1_k_decode.o: asn1_k_decode.c asn1_k_decode.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h asn1buf.h asn1_decode.h asn1_get.h asn1_misc.h
-asn1_encode.o: asn1_encode.c asn1_encode.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1_encode.o: asn1_encode.c asn1_encode.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h asn1buf.h asn1_make.h
-asn1_get.o: asn1_get.c asn1_get.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1_get.o: asn1_get.c asn1_get.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h asn1buf.h
-asn1_make.o: asn1_make.c asn1_make.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1_make.o: asn1_make.c asn1_make.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h asn1buf.h
-asn1buf.o: asn1buf.c asn1buf.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1buf.o: asn1buf.c asn1buf.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h asn1_get.h
 krb5_decode.o: krb5_decode.c $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  krbasn1.h $(BUILDTOP)/../src/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  krbasn1.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/krb5/kdb.h \
   asn1_k_decode.h asn1buf.h asn1_decode.h asn1_get.h
 krb5_encode.o: krb5_encode.c $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  asn1_k_encode.h $(BUILDTOP)/../src/include/k5-int.h \
-  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(BUILDTOP)/../src/include/krb5/kdb.h asn1buf.h krbasn1.h \
-  asn1_encode.h asn1_make.h
-asn1_k_encode.o: asn1_k_encode.c asn1_k_encode.h $(BUILDTOP)/../src/include/k5-int.h \
+  asn1_k_encode.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/krb5/kdb.h \
+  asn1buf.h krbasn1.h asn1_encode.h asn1_make.h
+asn1_k_encode.o: asn1_k_encode.c asn1_k_encode.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   asn1buf.h krbasn1.h asn1_make.h asn1_encode.h
-asn1_misc.o: asn1_misc.c asn1_misc.h $(BUILDTOP)/../src/include/k5-int.h \
+asn1_misc.o: asn1_misc.c asn1_misc.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
   krbasn1.h
 
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 7816392240..72fce37cca 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -495,7 +495,7 @@ get_in_tkt.o: get_in_tkt.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
-  int-proto.h $(SRCTOP)/lib/krb5/os/os-proto.h
+  int-proto.h $(srcdir)/../os/os-proto.h
 gic_keytab.o: gic_keytab.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
@@ -523,7 +523,7 @@ in_tkt_sky.o: in_tkt_sky.c $(SRCTOP)/include/k5-int.h \
 init_ctx.o: init_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h brand.c $(SRCTOP)/lib/krb5/krb5_libinit.h
+  $(SRCTOP)/include/krb5/kdb.h brand.c $(srcdir)/../krb5_libinit.h
 kdc_rep_dc.o: kdc_rep_dc.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 3b0743b439..de576cd5db 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -64,34 +64,31 @@ ktest_equal.o: ktest_equal.h
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-krb5_encode_test.o: krb5_encode_test.c $(BUILDTOP)/../src/include/k5-int.h \
+krb5_encode_test.o: krb5_encode_test.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
-  utility.h $(BUILDTOP)/../src/lib/krb5/asn.1/krbasn1.h \
-  $(BUILDTOP)/../src/lib/krb5/asn.1/asn1buf.h ktest.h \
-  debug.h
-krb5_encode_test.o: krb5_encode_test.c $(BUILDTOP)/../src/include/k5-int.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
+  utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h $(SRCTOP)/lib/krb5/asn.1/asn1buf.h \
+  ktest.h debug.h
+krb5_encode_test.o: krb5_encode_test.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
-  utility.h $(BUILDTOP)/../src/lib/krb5/asn.1/krbasn1.h \
-  $(BUILDTOP)/../src/lib/krb5/asn.1/asn1buf.h ktest.h \
-  debug.h
-ktest.o: ktest.c ktest.h $(BUILDTOP)/../src/include/k5-int.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
+  utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h $(SRCTOP)/lib/krb5/asn.1/asn1buf.h \
+  ktest.h debug.h
+ktest.o: ktest.c ktest.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h \
-  utility.h $(BUILDTOP)/../src/lib/krb5/asn.1/krbasn1.h \
-  $(BUILDTOP)/../src/lib/krb5/asn.1/asn1buf.h
-ktest_equal.o: ktest_equal.c ktest_equal.h $(BUILDTOP)/../src/include/k5-int.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
+  utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h $(SRCTOP)/lib/krb5/asn.1/asn1buf.h
+ktest_equal.o: ktest_equal.c ktest_equal.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(BUILDTOP)/../src/include/krb5/kdb.h
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h
 utility.o: utility.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h utility.h $(BUILDTOP)/../src/lib/krb5/asn.1/krbasn1.h \
-  $(BUILDTOP)/../src/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/../src/include/krb5/kdb.h \
-  $(BUILDTOP)/../src/lib/krb5/asn.1/asn1buf.h
+  $(BUILDTOP)/include/com_err.h utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h \
+  $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/krb5/kdb.h \
+  $(SRCTOP)/lib/krb5/asn.1/asn1buf.h
 trval.o: trval.c