diff --git a/Makefile.in b/Makefile.in
index f0498eba36..b625a46c8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,6 +63,8 @@ generated: force buildtools
 	+${COMPILE_PART1} vlserver ${COMPILE_GENERATED}
 	+${COMPILE_PART1} volser ${COMPILE_GENERATED}
 	+${COMPILE_PART1} config ${COMPILE_PART2A} generated_clean
+	+${COMPILE_PART1} roken ${COMPILE_PART2A} clean
+	+${COMPILE_PART1} crypto/hcrypto ${COMPILE_PART2A} clean
 
 install: all install_dirs
 	$(MAKE) build COMPILE_PART2B=install
diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in
index d16871d47c..3199b469f3 100644
--- a/src/crypto/hcrypto/Makefile.in
+++ b/src/crypto/hcrypto/Makefile.in
@@ -35,6 +35,8 @@ MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto
 
 SHLIBOBJ= libafshcrypto.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR}
 
+buildtools: ${HEADERS} ${TOP_LIBDIR}/libafshcrypto.a
+
 all: ${HEADERS} ${TOP_LIBDIR}/${SHLIBOBJ} \
 	${TOP_LIBDIR}/libafshcrypto.a \
 	${TOP_LIBDIR}/libafshcrypto_lwp.a
diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in
index afa03d33d7..539620a4db 100644
--- a/src/roken/Makefile.in
+++ b/src/roken/Makefile.in
@@ -16,6 +16,8 @@ UPSTREAM = $(TOP_SRCDIR)/external/heimdal/roken
 
 SHLIBOBJ = librokenafs.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR}
 
+buildtools: $(ROKEN_HEADERS) $(HEADERS) $(TOP_LIBDIR)/librokenafs.a
+
 all: $(ROKEN_HEADERS) $(HEADERS) \
 	$(TOP_LIBDIR)/$(SHLIBOBJ) \
 	$(TOP_LIBDIR)/librokenafs.a