diff --git a/configure-libafs.ac b/configure-libafs.ac
index 7e1429c58c..d4dc69b066 100644
--- a/configure-libafs.ac
+++ b/configure-libafs.ac
@@ -19,6 +19,7 @@ AC_OUTPUT(             \
 Makefile               \
 src/config/Makefile    \
 src/config/Makefile.config \
+src/config/Makefile.lwp \
 src/config/Makefile.version-CML \
 src/config/Makefile.version-NOCML \
 src/libafs/Makefile.common \
diff --git a/src/auth/libafsdep b/src/auth/libafsdep
new file mode 100644
index 0000000000..d6ca04d8b1
--- /dev/null
+++ b/src/auth/libafsdep
@@ -0,0 +1 @@
+Ktoken.xdr.c
diff --git a/src/config/libafsdep b/src/config/libafsdep
index ce19006f01..2836a2c2fe 100644
--- a/src/config/libafsdep
+++ b/src/config/libafsdep
@@ -1,5 +1,6 @@
 Makefile.in
 Makefile.config.in
+Makefile.lwp.in
 Makefile.version-CML.in
 Makefile.version-NOCML.in
 afsconfig.h.in
diff --git a/src/crypto/hcrypto/kernel/libafsdep b/src/crypto/hcrypto/kernel/libafsdep
new file mode 100644
index 0000000000..0a8aac6e2d
--- /dev/null
+++ b/src/crypto/hcrypto/kernel/libafsdep
@@ -0,0 +1,11 @@
+stdio.h
+alloc.c
+stdlib.h
+string.h
+assert.h
+config.h
+roken.h
+krb5-types.h
+evp-algs.c
+rand.c
+evp-hcrypto.h
diff --git a/src/crypto/rfc3961/kernel/libafsdep b/src/crypto/rfc3961/kernel/libafsdep
new file mode 100644
index 0000000000..66b7f1e135
--- /dev/null
+++ b/src/crypto/rfc3961/kernel/libafsdep
@@ -0,0 +1,2 @@
+algs.c
+random.c
diff --git a/src/crypto/rfc3961/libafsdep b/src/crypto/rfc3961/libafsdep
new file mode 100644
index 0000000000..b314213e6a
--- /dev/null
+++ b/src/crypto/rfc3961/libafsdep
@@ -0,0 +1,3 @@
+krb5_locl.h
+context.c
+copy.c
diff --git a/src/external/heimdal/hcrypto/libafsdep b/src/external/heimdal/hcrypto/libafsdep
new file mode 100644
index 0000000000..73a6e1790e
--- /dev/null
+++ b/src/external/heimdal/hcrypto/libafsdep
@@ -0,0 +1,14 @@
+md5.[ch]
+evp.[ch]
+aes.[ch]
+sha.[ch]
+evp-cc.h
+rijndael-alg-fst.[ch]
+hash.h
+crypto-aes.c
+crypto.c
+crypto-ct.c
+crypto-data.c
+crypto-evp.c
+crypto-keyblock.c
+crypto-store-int.c
diff --git a/src/external/heimdal/krb5/libafsdep b/src/external/heimdal/krb5/libafsdep
new file mode 100644
index 0000000000..ccfcb018d3
--- /dev/null
+++ b/src/external/heimdal/krb5/libafsdep
@@ -0,0 +1,7 @@
+n-fold.c
+crypto.[ch]
+crypto-aes.c
+data.c
+crypto-evp.c
+keyblock.c
+store-int.c
diff --git a/src/external/heimdal/roken/libafsdep b/src/external/heimdal/roken/libafsdep
new file mode 100644
index 0000000000..bb22144536
--- /dev/null
+++ b/src/external/heimdal/roken/libafsdep
@@ -0,0 +1 @@
+ct.c
diff --git a/src/opr/libafsdep b/src/opr/libafsdep
new file mode 100644
index 0000000000..8276bcfe1f
--- /dev/null
+++ b/src/opr/libafsdep
@@ -0,0 +1,2 @@
+rbtree.c
+rbtree.h
diff --git a/src/rxkad/libafsdep b/src/rxkad/libafsdep
index ddf830fa58..ea85bbcd30 100644
--- a/src/rxkad/libafsdep
+++ b/src/rxkad/libafsdep
@@ -8,3 +8,4 @@ fcrypt.c
 fcrypt.h
 sboxes.h
 tcrypt.c
+stats.h