Index: heimdal/lib/hcrypto/Makefile.am
===================================================================
--- heimdal.orig/lib/hcrypto/Makefile.am
+++ heimdal/lib/hcrypto/Makefile.am
@@ -104,6 +104,11 @@ TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS)
 LDADD = $(lib_LTLIBRARIES) $(LIB_roken) $(LIB_openssl_crypto)
 test_rand_LDADD = $(LDADD) -lm
 
+ALL_OBJECTS  = $(libhcrypto_la_OBJECTS)
+ALL_OBJECTS += $(test_rand_OBJECTS)
+ALL_OBJECTS += $(libhctest_la_OBJECTS)
+$(ALL_OBJECTS): | install-build-headers
+
 libhcrypto_la_SOURCES =	\
 	$(ltmsources)	\
 	aes.c		\
Index: heimdal/lib/hx509/Makefile.am
===================================================================
--- heimdal.orig/lib/hx509/Makefile.am
+++ heimdal/lib/hx509/Makefile.am
@@ -147,8 +147,8 @@ HX509_PROTOS = $(srcdir)/hx509-protos.h
 
 $(ALL_OBJECTS): $(HX509_PROTOS)
 
-$(libhx509_la_OBJECTS): $(srcdir)/hx_locl.h
-$(libhx509_la_OBJECTS): ocsp_asn1.h pkcs10_asn1.h
+$(ALL_OBJECTS): $(srcdir)/hx_locl.h
+$(ALL_OBJECTS): ocsp_asn1.h pkcs10_asn1.h
 
 $(srcdir)/hx509-protos.h: $(dist_libhx509_la_SOURCES)
 	$(heim_verbose)cd $(srcdir) && perl ../../cf/make-proto.pl -R '^(_|^C)' -E HX509_LIB -q -P comment -o hx509-protos.h $(dist_libhx509_la_SOURCES) || rm -f hx509-protos.h
