diff --git a/Makefile.am b/Makefile.am
index 7fb69fdf4..b9bdcf499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,6 @@ EXTRA_DIST = \
 	cf/ChangeLog \
 	cf/have-pragma-weak.m4 \
 	cf/have-types.m4 \
-	cf/krb-func-getcwd-broken.m4 \
 	cf/krb-prog-ranlib.m4 \
 	cf/krb-prog-yacc.m4 \
 	cf/krb-sys-aix.m4 \
diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index 1f1e516bd..7fdd527dc 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -244,7 +244,7 @@ include_HEADERS = kdc.h $(srcdir)/kdc-protos.h
 noinst_HEADERS = $(srcdir)/kdc-private.h
 
 krb5dir = $(includedir)/krb5
-krb5_HEADERS = kdc-audit.h kdc-plugin.h token_validator_plugin.h csr_authorizer_plugin.h
+krb5_HEADERS = kdc-audit.h kdc-plugin.h token_validator_plugin.h csr_authorizer_plugin.h gss_preauth_authorizer_plugin.h
 
 build_HEADERZ = $(krb5_HEADERS) # XXX
 
diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index 2d86bdd36..7b1dcd824 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -6,7 +6,7 @@ WFLAGS += $(WFLAGS_ENUM_CONV)
 
 YFLAGS = -d -t
 
-AM_CPPFLAGS += $(ROKEN_RENAME)
+AM_CPPFLAGS += $(ROKEN_RENAME) -I$(top_builddir)/include -I$(top_srcdir)/lib/base
 
 man_MANS = asn1_print.1 asn1_compile.1
 
@@ -543,35 +543,43 @@ test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
 		$(CLANG_FORMAT) -style='{BasedOnStyle: Mozilla, AlwaysBreakAfterReturnType: TopLevelDefinitions, IndentWidth: 4, SortIncludes: false}' -i asn1_test_asn1.c
 
 
-EXTRA_DIST =		\
-	NTMakefile	\
-	README.template \
-	asn1_compile-version.rc \
-	libasn1-exports.def \
-	cms.asn1	\
-	cms.opt		\
-	crmf.asn1	\
-	crmf.opt	\
-	asn1_err.et	\
-	canthandle.asn1	\
-	digest.asn1	\
-	krb5.asn1	\
-	krb5.opt	\
-	kx509.asn1	\
-	ocsp.asn1	\
-	pkcs12.asn1	\
-	pkcs8.asn1	\
-	pkcs9.asn1	\
-	pkcs10.asn1	\
-	pkinit.asn1	\
-	rfc2459.asn1	\
-	rfc4108.asn1	\
-	tcg.asn1	\
-	setchgpw2.asn1	\
-	x690sample.asn1	\
-	test.asn1	\
-	test.opt	\
-	test.gen	\
+EXTRA_DIST =			\
+	NTMakefile		\
+	README-template.md	\
+	asn1_compile-version.rc	\
+	libasn1-exports.def	\
+	canthandle.asn1		\
+	cms.asn1		\
+	cms.opt			\
+	crmf.asn1		\
+	crmf.opt		\
+	digest.asn1		\
+	krb5.asn1		\
+	krb5.opt		\
+	kx509.asn1		\
+	ocsp.asn1		\
+	ocsp.opt		\
+	pkcs10.asn1		\
+	pkcs10.opt		\
+	pkcs12.asn1		\
+	pkcs8.asn1		\
+	pkcs9.asn1		\
+	pkinit.asn1		\
+	pku2u.asn1		\
+	rfc2459.asn1		\
+	rfc2459.opt		\
+	rfc4108.asn1		\
+	setchgpw2.asn1		\
+	tcg.asn1		\
+	test.asn1		\
+	test.opt		\
+	x690sample.asn1		\
+	test.gen		\
+	asn1_err.et		\
+	asn1_err.c		\
+	asn1_err.h		\
+	asn1_print.1		\
+	asn1_compile.1		\
 	version-script.map
 
 DER_PROTOS = $(srcdir)/der-protos.h $(srcdir)/der-private.h
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index b060c58b9..12ee1c3a6 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -7,6 +7,7 @@ WFLAGS += $(WFLAGS_ENUM_CONV)
 AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CPPFLAGS += \
+	-I$(top_srcdir)/lib \
 	-I$(srcdir)/../krb5 \
 	-I$(srcdir) \
 	-I$(srcdir)/gssapi \
@@ -252,6 +253,7 @@ sanonsrc = \
 	sanon/process_context_token.c \
 	sanon/release_cred.c \
 	sanon/release_name.c \
+	sanon/sanon_locl.h \
 	sanon/sanon-private.h
 
 dist_libgssapi_la_SOURCES  = \
diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
index fd2966116..bb36f7451 100644
--- a/lib/hcrypto/Makefile.am
+++ b/lib/hcrypto/Makefile.am
@@ -61,8 +61,7 @@ hcryptoinclude_HEADERS =	\
 	rsa.h			\
 	sha.h			\
 	ui.h			\
-	undef.h			\
-	x25519_ref10.h
+	undef.h
 
 install-build-headers:: $(hcryptoinclude_HEADERS) $(x25519include_HEADERS)
 	@foo='$(hcryptoinclude_HEADERS)'; \
@@ -104,6 +103,22 @@ SCRIPT_TESTS = \
 
 noinst_PROGRAMS = test_rand
 
+noinst_HEADERS = \
+	x25519/ed25519_ref10_fe_51.h	\
+	x25519/ed25519_ref10_fe_25_5.h	\
+	x25519/ed25519_ref10.h	\
+	x25519/fe_25_5/base.h	\
+	x25519/fe_25_5/base2.h	\
+	x25519/fe_25_5/constants.h  \
+	x25519/fe_25_5/fe.h \
+	x25519/fe_51/base.h \
+	x25519/fe_51/base2.h	\
+	x25519/fe_51/constants.h    \
+	x25519/fe_51/fe.h   \
+	x25519/align.h	\
+	x25519_ref10.h
+
+
 check_PROGRAMS = $(PROGRAM_TESTS) test_rsa test_dh example_evp_cipher
 check_SCRIPTS = $(SCRIPT_TESTS)
 
@@ -336,7 +351,12 @@ ltmsources = \
 	libtommath/bn_s_mp_sqr_fast.c \
 	libtommath/bn_s_mp_sub.c \
 	libtommath/bn_s_mp_toom_mul.c \
-	libtommath/bn_s_mp_toom_sqr.c
+	libtommath/bn_s_mp_toom_sqr.c \
+	libtommath/tommath_private.h \
+	libtommath/tommath_cutoffs.h \
+	libtommath/tommath_superclass.h \
+	libtommath/tommath_class.h \
+	libtommath/tommath.h
 
 x25519sources = \
 	x25519/ed25519_ref10.c \
diff --git a/tests/gss/Makefile.am b/tests/gss/Makefile.am
index ca40ae26b..2de36bfe2 100644
--- a/tests/gss/Makefile.am
+++ b/tests/gss/Makefile.am
@@ -95,7 +95,9 @@ EXTRA_DIST = \
 	check-spnego.in \
 	check-ntlm.in \
 	check-context.in \
+	check-negoex.in \
 	ntlm-user-file.txt \
 	krb5.conf.in \
+	include-krb5.conf \
 	new_clients_k5.conf.in \
 	mech.in
diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
index a07f776eb..507be3814 100644
--- a/tests/kdc/Makefile.am
+++ b/tests/kdc/Makefile.am
@@ -383,23 +383,23 @@ EXTRA_DIST = \
 	NTMakefile \
 	an2ln-db.txt \
 	check-authz.in \
+	check-bx509.in \
 	check-canon.in \
 	check-cc.in \
 	check-delegation.in \
 	check-des.in \
 	check-digest.in \
 	check-fast.in \
+	check-hdb-mitdb.in \
+	check-httpkadmind.in \
 	check-iprop.in \
 	check-kadmin.in \
-	check-kinit.in \
-	check-hdb-mitdb.in \
-	check-kdc.in \
 	check-kdc-weak.in \
+	check-kdc.in \
 	check-keys.in \
+	check-kinit.in \
 	check-kpasswdd.in \
 	check-pkinit.in \
-	check-bx509.in \
-	check-httpkadmind.in \
 	check-referral.in \
 	check-tester.in \
 	check-uu.in \
@@ -409,23 +409,25 @@ EXTRA_DIST = \
 	hdb-mitdb.mkey \
 	heimdal.acl \
 	iprop-acl \
+	k5login/foo \
+	k5login/mapped_user1 \
 	kdc-tester1.json \
 	kdc-tester2.json \
 	kdc-tester3.json \
 	kdc-tester4.json.in \
-	krb5-pkinit.conf.in \
-	krb5-bx509.conf.in \
-	krb5-httpkadmind.conf.in \
-	krb5.conf.in \
 	krb5-authz.conf.in \
 	krb5-authz2.conf.in \
+	krb5-bx509.conf.in \
 	krb5-canon.conf.in \
 	krb5-canon2.conf.in \
+	krb5-cccol.conf.in \
 	krb5-hdb-mitdb.conf.in \
+	krb5-httpkadmind.conf.in \
+	krb5-pkinit.conf.in \
+	krb5.conf.in \
 	krb5.conf.keys.in \
-	k5login/foo \
-	ntlm-user-file.txt \
 	leaks-kill.sh \
+	ntlm-user-file.txt \
 	pki-mapping \
 	uuserver.txt \
 	wait-kdc.sh