diff --git a/fips/rand/Makefile b/fips/rand/Makefile
index 8c3c9c0a7ea051bc7ed01366fcfae79f62b16a65..6890bd0f2ad844a2b36bb6cdd0d81113f8599ade 100644
--- a/fips/rand/Makefile
+++ b/fips/rand/Makefile
@@ -94,57 +94,78 @@ clean:
 
 fips_drbg_ctr.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_drbg_ctr.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_drbg_ctr.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 fips_drbg_ctr.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
 fips_drbg_ctr.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_drbg_ctr.o: ../../include/openssl/obj_mac.h
+fips_drbg_ctr.o: ../../include/openssl/hmac.h ../../include/openssl/obj_mac.h
 fips_drbg_ctr.o: ../../include/openssl/objects.h
 fips_drbg_ctr.o: ../../include/openssl/opensslconf.h
 fips_drbg_ctr.o: ../../include/openssl/opensslv.h
 fips_drbg_ctr.o: ../../include/openssl/ossl_typ.h
 fips_drbg_ctr.o: ../../include/openssl/safestack.h
 fips_drbg_ctr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_drbg_ctr.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_drbg_ctr.o: fips_drbg_ctr.c fips_rand_lcl.h
 fips_drbg_hash.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_drbg_hash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_drbg_hash.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 fips_drbg_hash.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
 fips_drbg_hash.o: ../../include/openssl/fips.h
 fips_drbg_hash.o: ../../include/openssl/fips_rand.h
-fips_drbg_hash.o: ../../include/openssl/obj_mac.h
+fips_drbg_hash.o: ../../include/openssl/hmac.h ../../include/openssl/obj_mac.h
 fips_drbg_hash.o: ../../include/openssl/objects.h
 fips_drbg_hash.o: ../../include/openssl/opensslconf.h
 fips_drbg_hash.o: ../../include/openssl/opensslv.h
 fips_drbg_hash.o: ../../include/openssl/ossl_typ.h
 fips_drbg_hash.o: ../../include/openssl/safestack.h
 fips_drbg_hash.o: ../../include/openssl/stack.h
-fips_drbg_hash.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_drbg_hash.o: ../../include/openssl/ui_compat.h fips_drbg_hash.c
+fips_drbg_hash.o: ../../include/openssl/symhacks.h fips_drbg_hash.c
 fips_drbg_hash.o: fips_rand_lcl.h
+fips_drbg_hmac.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+fips_drbg_hmac.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+fips_drbg_hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
+fips_drbg_hmac.o: ../../include/openssl/fips.h
+fips_drbg_hmac.o: ../../include/openssl/fips_rand.h
+fips_drbg_hmac.o: ../../include/openssl/hmac.h ../../include/openssl/obj_mac.h
+fips_drbg_hmac.o: ../../include/openssl/objects.h
+fips_drbg_hmac.o: ../../include/openssl/opensslconf.h
+fips_drbg_hmac.o: ../../include/openssl/opensslv.h
+fips_drbg_hmac.o: ../../include/openssl/ossl_typ.h
+fips_drbg_hmac.o: ../../include/openssl/safestack.h
+fips_drbg_hmac.o: ../../include/openssl/stack.h
+fips_drbg_hmac.o: ../../include/openssl/symhacks.h fips_drbg_hmac.c
+fips_drbg_hmac.o: fips_rand_lcl.h
 fips_drbg_lib.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_drbg_lib.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_drbg_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 fips_drbg_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_drbg_lib.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_drbg_lib.o: ../../include/openssl/fips_rand.h
-fips_drbg_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_drbg_lib.o: ../../include/openssl/evp.h ../../include/openssl/fips_rand.h
+fips_drbg_lib.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
+fips_drbg_lib.o: ../../include/openssl/obj_mac.h
 fips_drbg_lib.o: ../../include/openssl/objects.h
 fips_drbg_lib.o: ../../include/openssl/opensslconf.h
 fips_drbg_lib.o: ../../include/openssl/opensslv.h
 fips_drbg_lib.o: ../../include/openssl/ossl_typ.h
 fips_drbg_lib.o: ../../include/openssl/safestack.h
 fips_drbg_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_drbg_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_drbg_lib.o: fips_drbg_lib.c fips_rand_lcl.h
+fips_drbg_rand.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+fips_drbg_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+fips_drbg_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_drbg_rand.o: ../../include/openssl/evp.h ../../include/openssl/fips_rand.h
+fips_drbg_rand.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
+fips_drbg_rand.o: ../../include/openssl/obj_mac.h
+fips_drbg_rand.o: ../../include/openssl/objects.h
+fips_drbg_rand.o: ../../include/openssl/opensslconf.h
+fips_drbg_rand.o: ../../include/openssl/opensslv.h
+fips_drbg_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+fips_drbg_rand.o: ../../include/openssl/safestack.h
+fips_drbg_rand.o: ../../include/openssl/stack.h
+fips_drbg_rand.o: ../../include/openssl/symhacks.h fips_drbg_rand.c
+fips_drbg_rand.o: fips_rand_lcl.h
 fips_drbg_selftest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_drbg_selftest.o: ../../include/openssl/bio.h
 fips_drbg_selftest.o: ../../include/openssl/crypto.h
-fips_drbg_selftest.o: ../../include/openssl/des.h
-fips_drbg_selftest.o: ../../include/openssl/des_old.h
 fips_drbg_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_drbg_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_drbg_selftest.o: ../../include/openssl/evp.h
 fips_drbg_selftest.o: ../../include/openssl/fips_rand.h
+fips_drbg_selftest.o: ../../include/openssl/hmac.h
 fips_drbg_selftest.o: ../../include/openssl/lhash.h
 fips_drbg_selftest.o: ../../include/openssl/obj_mac.h
 fips_drbg_selftest.o: ../../include/openssl/objects.h
@@ -153,73 +174,89 @@ fips_drbg_selftest.o: ../../include/openssl/opensslv.h
 fips_drbg_selftest.o: ../../include/openssl/ossl_typ.h
 fips_drbg_selftest.o: ../../include/openssl/safestack.h
 fips_drbg_selftest.o: ../../include/openssl/stack.h
-fips_drbg_selftest.o: ../../include/openssl/symhacks.h
-fips_drbg_selftest.o: ../../include/openssl/ui.h
-fips_drbg_selftest.o: ../../include/openssl/ui_compat.h fips_drbg_selftest.c
-fips_drbg_selftest.o: fips_rand_lcl.h
-fips_drbgvs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_drbgvs.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_drbgvs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_drbgvs.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_drbgvs.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_drbgvs.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
+fips_drbg_selftest.o: ../../include/openssl/symhacks.h ../fips_locl.h
+fips_drbg_selftest.o: fips_drbg_selftest.c fips_drbg_selftest.h fips_rand_lcl.h
+fips_drbgvs.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+fips_drbgvs.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+fips_drbgvs.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
+fips_drbgvs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_drbgvs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_drbgvs.o: ../../include/openssl/fips_rand.h ../../include/openssl/hmac.h
 fips_drbgvs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 fips_drbgvs.o: ../../include/openssl/objects.h
 fips_drbgvs.o: ../../include/openssl/opensslconf.h
 fips_drbgvs.o: ../../include/openssl/opensslv.h
 fips_drbgvs.o: ../../include/openssl/ossl_typ.h
 fips_drbgvs.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_drbgvs.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_drbgvs.o: ../../include/openssl/ui_compat.h ../fips_utl.h fips_drbgvs.c
+fips_drbgvs.o: ../../include/openssl/symhacks.h ../fips_utl.h fips_drbgvs.c
 fips_rand.o: ../../e_os.h ../../include/openssl/aes.h
-fips_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_rand.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+fips_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+fips_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 fips_rand.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+fips_rand.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
+fips_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+fips_rand.o: ../../include/openssl/opensslconf.h
 fips_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 fips_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 fips_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_rand.o: ../fips_locl.h fips_rand.c
+fips_rand_lib.o: ../../e_os.h ../../include/openssl/aes.h
+fips_rand_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+fips_rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+fips_rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+fips_rand_lib.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
+fips_rand_lib.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
+fips_rand_lib.o: ../../include/openssl/obj_mac.h
+fips_rand_lib.o: ../../include/openssl/objects.h
+fips_rand_lib.o: ../../include/openssl/opensslconf.h
+fips_rand_lib.o: ../../include/openssl/opensslv.h
+fips_rand_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+fips_rand_lib.o: ../../include/openssl/safestack.h
+fips_rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+fips_rand_lib.o: fips_rand_lib.c
+fips_rand_selftest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_rand_selftest.o: ../../include/openssl/bio.h
 fips_rand_selftest.o: ../../include/openssl/crypto.h
-fips_rand_selftest.o: ../../include/openssl/des.h
-fips_rand_selftest.o: ../../include/openssl/des_old.h
 fips_rand_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rand_selftest.o: ../../include/openssl/fips.h
+fips_rand_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
 fips_rand_selftest.o: ../../include/openssl/fips_rand.h
+fips_rand_selftest.o: ../../include/openssl/hmac.h
 fips_rand_selftest.o: ../../include/openssl/lhash.h
+fips_rand_selftest.o: ../../include/openssl/obj_mac.h
+fips_rand_selftest.o: ../../include/openssl/objects.h
 fips_rand_selftest.o: ../../include/openssl/opensslconf.h
 fips_rand_selftest.o: ../../include/openssl/opensslv.h
 fips_rand_selftest.o: ../../include/openssl/ossl_typ.h
 fips_rand_selftest.o: ../../include/openssl/rand.h
 fips_rand_selftest.o: ../../include/openssl/safestack.h
 fips_rand_selftest.o: ../../include/openssl/stack.h
-fips_rand_selftest.o: ../../include/openssl/symhacks.h
-fips_rand_selftest.o: ../../include/openssl/ui.h
-fips_rand_selftest.o: ../../include/openssl/ui_compat.h fips_rand_selftest.c
-fips_randtest.o: ../../e_os.h ../../include/openssl/bio.h
+fips_rand_selftest.o: ../../include/openssl/symhacks.h ../fips_locl.h
+fips_rand_selftest.o: fips_rand_selftest.c
+fips_randtest.o: ../../e_os.h ../../include/openssl/aes.h
+fips_randtest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 fips_randtest.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_randtest.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 fips_randtest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_randtest.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_randtest.o: ../../include/openssl/lhash.h
+fips_randtest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_randtest.o: ../../include/openssl/fips_rand.h ../../include/openssl/hmac.h
+fips_randtest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_randtest.o: ../../include/openssl/objects.h
 fips_randtest.o: ../../include/openssl/opensslconf.h
 fips_randtest.o: ../../include/openssl/opensslv.h
 fips_randtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 fips_randtest.o: ../../include/openssl/safestack.h
 fips_randtest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_randtest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_randtest.o: ../fips_utl.h fips_randtest.c
+fips_rngvs.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_rngvs.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_rngvs.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_rngvs.o: ../../include/openssl/des_old.h ../../include/openssl/dsa.h
+fips_rngvs.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
 fips_rngvs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rngvs.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_rngvs.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+fips_rngvs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
+fips_rngvs.o: ../../include/openssl/fips_rand.h ../../include/openssl/hmac.h
+fips_rngvs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+fips_rngvs.o: ../../include/openssl/objects.h
+fips_rngvs.o: ../../include/openssl/opensslconf.h
 fips_rngvs.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 fips_rngvs.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 fips_rngvs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rngvs.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_rngvs.o: ../fips_utl.h fips_rngvs.c