diff --git a/build.info b/build.info
index ceb250f7f4..9dffdd5b35 100644
--- a/build.info
+++ b/build.info
@@ -1,3 +1,5 @@
+SUBDIRS=crypto ssl apps test util tools fuzz engines
+
 {-
      use File::Spec::Functions;
 
diff --git a/crypto/build.info b/crypto/build.info
index 2c619c62e8..71e1110f9d 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -1,3 +1,10 @@
+SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 x509v3 conf \
+        txt_db pkcs7 pkcs12 ui kdf store \
+        md2 md4 md5 sha mdc2 hmac ripemd whrlpool poly1305 blake2 \
+        siphash sm3 des aes rc2 rc4 rc5 idea aria bf cast camellia \
+        seed sm4 chacha modes bn ec rsa dsa dh sm2 dso engine \
+        err comp ocsp cms ts srp cmac ct async
+
 LIBS=../libcrypto
 SOURCE[../libcrypto]=\
         cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
diff --git a/test/build.info b/test/build.info
index 4d3ea5d059..d2acbeda20 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,3 +1,4 @@
+SUBDIRS=ossl_shim
 {-
      use File::Spec::Functions;
      sub rebase_files