71 files changed, 6 insertions, 106 deletions
diff --git a/src/lib/asn1/info.txt b/src/lib/asn1/info.txt
index 891e9fae3..c6c3db537 100644
--- a/src/lib/asn1/info.txt
+++ b/src/lib/asn1/info.txt
@@ -3,7 +3,7 @@ define ASN1 20131128
 load_on auto
 
 <requires>
-alloc
+filters
 bigint
 oid_lookup
 </requires>
diff --git a/src/lib/base/lookup.cpp b/src/lib/base/lookup.cpp
index e82866e37..b6a49ec6b 100644
--- a/src/lib/base/lookup.cpp
+++ b/src/lib/base/lookup.cpp
@@ -8,7 +8,6 @@
 #include <botan/lookup.h>
 #include <botan/internal/algo_registry.h>
 #include <botan/cipher_mode.h>
-#include <botan/transform_filter.h>
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
 #include <botan/hash.h>
diff --git a/src/lib/benchmark/info.txt b/src/lib/benchmark/info.txt
index 6a2aaf476..6a26f0059 100644
--- a/src/lib/benchmark/info.txt
+++ b/src/lib/benchmark/info.txt
@@ -1,9 +1 @@
 define RUNTIME_BENCHMARKING 20131128
-
-<requires>
-block
-hash
-mac
-rng
-stream
-</requires>
diff --git a/src/lib/block/lion/info.txt b/src/lib/block/lion/info.txt
index c775ff428..6074dbd08 100644
--- a/src/lib/block/lion/info.txt
+++ b/src/lib/block/lion/info.txt
@@ -1,6 +1 @@
 define LION 20131128
-
-<requires>
-hash
-stream
-</requires>
diff --git a/src/lib/checksum/adler32/info.txt b/src/lib/checksum/adler32/info.txt
deleted file mode 100644
index 6744fbee4..000000000
--- a/src/lib/checksum/adler32/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-define ADLER32 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/checksum/crc24/info.txt b/src/lib/checksum/crc24/info.txt
deleted file mode 100644
index f3762c66f..000000000
--- a/src/lib/checksum/crc24/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-define CRC24 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/checksum/crc32/info.txt b/src/lib/checksum/crc32/info.txt
deleted file mode 100644
index c7275ab43..000000000
--- a/src/lib/checksum/crc32/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-define CRC32 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/checksum/adler32/adler32.cpp b/src/lib/hash/checksum/adler32/adler32.cpp
index f2385c5b8..f2385c5b8 100644
--- a/src/lib/checksum/adler32/adler32.cpp
+++ b/src/lib/hash/checksum/adler32/adler32.cpp
diff --git a/src/lib/checksum/adler32/adler32.h b/src/lib/hash/checksum/adler32/adler32.h
index f3767b786..f3767b786 100644
--- a/src/lib/checksum/adler32/adler32.h
+++ b/src/lib/hash/checksum/adler32/adler32.h
diff --git a/src/lib/hash/checksum/adler32/info.txt b/src/lib/hash/checksum/adler32/info.txt
new file mode 100644
index 000000000..26ca8b255
--- /dev/null
+++ b/src/lib/hash/checksum/adler32/info.txt
@@ -0,0 +1 @@
+define ADLER32 20131128
diff --git a/src/lib/checksum/crc24/crc24.cpp b/src/lib/hash/checksum/crc24/crc24.cpp
index 4f747c232..4f747c232 100644
--- a/src/lib/checksum/crc24/crc24.cpp
+++ b/src/lib/hash/checksum/crc24/crc24.cpp
diff --git a/src/lib/checksum/crc24/crc24.h b/src/lib/hash/checksum/crc24/crc24.h
index a5cc090ad..a5cc090ad 100644
--- a/src/lib/checksum/crc24/crc24.h
+++ b/src/lib/hash/checksum/crc24/crc24.h
diff --git a/src/lib/hash/checksum/crc24/info.txt b/src/lib/hash/checksum/crc24/info.txt
new file mode 100644
index 000000000..c55ad3108
--- /dev/null
+++ b/src/lib/hash/checksum/crc24/info.txt
@@ -0,0 +1 @@
+define CRC24 20131128
diff --git a/src/lib/checksum/crc32/crc32.cpp b/src/lib/hash/checksum/crc32/crc32.cpp
index cb4ff7b5f..cb4ff7b5f 100644
--- a/src/lib/checksum/crc32/crc32.cpp
+++ b/src/lib/hash/checksum/crc32/crc32.cpp
diff --git a/src/lib/checksum/crc32/crc32.h b/src/lib/hash/checksum/crc32/crc32.h
index 503b18b7a..503b18b7a 100644
--- a/src/lib/checksum/crc32/crc32.h
+++ b/src/lib/hash/checksum/crc32/crc32.h
diff --git a/src/lib/hash/checksum/crc32/info.txt b/src/lib/hash/checksum/crc32/info.txt
new file mode 100644
index 000000000..44bb2b56a
--- /dev/null
+++ b/src/lib/hash/checksum/crc32/info.txt
@@ -0,0 +1 @@
+define CRC32 20131128
diff --git a/src/lib/kdf/kdf1/info.txt b/src/lib/kdf/kdf1/info.txt
index 08192fa95..a77bf1508 100644
--- a/src/lib/kdf/kdf1/info.txt
+++ b/src/lib/kdf/kdf1/info.txt
@@ -1,5 +1 @@
 define KDF1 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/kdf/kdf2/info.txt b/src/lib/kdf/kdf2/info.txt
index 3481ff04f..4f63019b1 100644
--- a/src/lib/kdf/kdf2/info.txt
+++ b/src/lib/kdf/kdf2/info.txt
@@ -1,5 +1 @@
 define KDF2 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/mac/cbc_mac/info.txt b/src/lib/mac/cbc_mac/info.txt
index cb017e2a1..5e864ca22 100644
--- a/src/lib/mac/cbc_mac/info.txt
+++ b/src/lib/mac/cbc_mac/info.txt
@@ -1,5 +1 @@
 define CBC_MAC 20131128
-
-<requires>
-block
-</requires>
diff --git a/src/lib/mac/cmac/info.txt b/src/lib/mac/cmac/info.txt
index d2dc6f68d..39c75aed1 100644
--- a/src/lib/mac/cmac/info.txt
+++ b/src/lib/mac/cmac/info.txt
@@ -1,5 +1 @@
 define CMAC 20131128
-
-<requires>
-block
-</requires>
diff --git a/src/lib/mac/hmac/info.txt b/src/lib/mac/hmac/info.txt
index 7bc8b27f8..171cd8515 100644
--- a/src/lib/mac/hmac/info.txt
+++ b/src/lib/mac/hmac/info.txt
@@ -1,5 +1 @@
 define HMAC 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/constructs/aont/info.txt b/src/lib/misc/aont/info.txt
index fb66d4129..05426fba9 100644
--- a/src/lib/constructs/aont/info.txt
+++ b/src/lib/misc/aont/info.txt
@@ -1,7 +1,6 @@
 define PACKAGE_TRANSFORM 20131128
 
 <requires>
-block
 ctr
 rng
 filters
diff --git a/src/lib/constructs/aont/package.cpp b/src/lib/misc/aont/package.cpp
index 731cae408..731cae408 100644
--- a/src/lib/constructs/aont/package.cpp
+++ b/src/lib/misc/aont/package.cpp
diff --git a/src/lib/constructs/aont/package.h b/src/lib/misc/aont/package.h
index 76e679490..76e679490 100644
--- a/src/lib/constructs/aont/package.h
+++ b/src/lib/misc/aont/package.h
diff --git a/src/lib/constructs/cryptobox/cryptobox.cpp b/src/lib/misc/cryptobox/cryptobox.cpp
index fb210bc0b..fb210bc0b 100644
--- a/src/lib/constructs/cryptobox/cryptobox.cpp
+++ b/src/lib/misc/cryptobox/cryptobox.cpp
diff --git a/src/lib/constructs/cryptobox/cryptobox.h b/src/lib/misc/cryptobox/cryptobox.h
index 27dc55a68..27dc55a68 100644
--- a/src/lib/constructs/cryptobox/cryptobox.h
+++ b/src/lib/misc/cryptobox/cryptobox.h
diff --git a/src/lib/constructs/cryptobox/info.txt b/src/lib/misc/cryptobox/info.txt
index b7bf6e4e8..b7bf6e4e8 100644
--- a/src/lib/constructs/cryptobox/info.txt
+++ b/src/lib/misc/cryptobox/info.txt
diff --git a/src/lib/constructs/fpe_fe1/fpe_fe1.cpp b/src/lib/misc/fpe_fe1/fpe_fe1.cpp
index c0a29519a..c0a29519a 100644
--- a/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
+++ b/src/lib/misc/fpe_fe1/fpe_fe1.cpp
diff --git a/src/lib/constructs/fpe_fe1/fpe_fe1.h b/src/lib/misc/fpe_fe1/fpe_fe1.h
index a1cae9917..a1cae9917 100644
--- a/src/lib/constructs/fpe_fe1/fpe_fe1.h
+++ b/src/lib/misc/fpe_fe1/fpe_fe1.h
diff --git a/src/lib/constructs/fpe_fe1/info.txt b/src/lib/misc/fpe_fe1/info.txt
index 42264e54e..42264e54e 100644
--- a/src/lib/constructs/fpe_fe1/info.txt
+++ b/src/lib/misc/fpe_fe1/info.txt
diff --git a/src/lib/prf/hkdf/hkdf.cpp b/src/lib/misc/hkdf/hkdf.cpp
index 49fa7e256..49fa7e256 100644
--- a/src/lib/prf/hkdf/hkdf.cpp
+++ b/src/lib/misc/hkdf/hkdf.cpp
diff --git a/src/lib/prf/hkdf/hkdf.h b/src/lib/misc/hkdf/hkdf.h
index 6bc68796b..6bc68796b 100644
--- a/src/lib/prf/hkdf/hkdf.h
+++ b/src/lib/misc/hkdf/hkdf.h
diff --git a/src/lib/misc/hkdf/info.txt b/src/lib/misc/hkdf/info.txt
new file mode 100644
index 000000000..7389e5bb1
--- /dev/null
+++ b/src/lib/misc/hkdf/info.txt
@@ -0,0 +1 @@
+define HKDF 20131128
diff --git a/src/lib/codec/openpgp/info.txt b/src/lib/misc/openpgp/info.txt
index 72467ee72..72467ee72 100644
--- a/src/lib/codec/openpgp/info.txt
+++ b/src/lib/misc/openpgp/info.txt
diff --git a/src/lib/codec/openpgp/openpgp.cpp b/src/lib/misc/openpgp/openpgp.cpp
index 3a464d906..3a464d906 100644
--- a/src/lib/codec/openpgp/openpgp.cpp
+++ b/src/lib/misc/openpgp/openpgp.cpp
diff --git a/src/lib/codec/openpgp/openpgp.h b/src/lib/misc/openpgp/openpgp.h
index 538b31342..538b31342 100644
--- a/src/lib/codec/openpgp/openpgp.h
+++ b/src/lib/misc/openpgp/openpgp.h
diff --git a/src/lib/constructs/pbes2/info.txt b/src/lib/misc/pbes2/info.txt
index 8a1ca491e..ed88ac3eb 100644
--- a/src/lib/constructs/pbes2/info.txt
+++ b/src/lib/misc/pbes2/info.txt
@@ -2,9 +2,7 @@ define PKCS5_PBES2 20141119
 
 <requires>
 asn1
-block
 cbc
-hash
 hmac
 oid_lookup
 pbkdf2
diff --git a/src/lib/constructs/pbes2/pbes2.cpp b/src/lib/misc/pbes2/pbes2.cpp
index 17f14170d..17f14170d 100644
--- a/src/lib/constructs/pbes2/pbes2.cpp
+++ b/src/lib/misc/pbes2/pbes2.cpp
diff --git a/src/lib/constructs/pbes2/pbes2.h b/src/lib/misc/pbes2/pbes2.h
index 90aa4f84b..90aa4f84b 100644
--- a/src/lib/constructs/pbes2/pbes2.h
+++ b/src/lib/misc/pbes2/pbes2.h
diff --git a/src/lib/codec/pem/info.txt b/src/lib/misc/pem/info.txt
index 74b90eef4..008240adc 100644
--- a/src/lib/codec/pem/info.txt
+++ b/src/lib/misc/pem/info.txt
@@ -2,5 +2,5 @@ define PEM_CODEC 20131128
 
 <requires>
 base64
-codec_filt
+filters
 </requires>
diff --git a/src/lib/codec/pem/pem.cpp b/src/lib/misc/pem/pem.cpp
index 9b57c1531..9b57c1531 100644
--- a/src/lib/codec/pem/pem.cpp
+++ b/src/lib/misc/pem/pem.cpp
diff --git a/src/lib/codec/pem/pem.h b/src/lib/misc/pem/pem.h
index 3b3fec32e..3b3fec32e 100644
--- a/src/lib/codec/pem/pem.h
+++ b/src/lib/misc/pem/pem.h
diff --git a/src/lib/constructs/rfc3394/info.txt b/src/lib/misc/rfc3394/info.txt
index 8cd5989ca..8cd5989ca 100644
--- a/src/lib/constructs/rfc3394/info.txt
+++ b/src/lib/misc/rfc3394/info.txt
diff --git a/src/lib/constructs/rfc3394/rfc3394.cpp b/src/lib/misc/rfc3394/rfc3394.cpp
index 422f2a2dd..422f2a2dd 100644
--- a/src/lib/constructs/rfc3394/rfc3394.cpp
+++ b/src/lib/misc/rfc3394/rfc3394.cpp
diff --git a/src/lib/constructs/rfc3394/rfc3394.h b/src/lib/misc/rfc3394/rfc3394.h
index fab6bc3cb..fab6bc3cb 100644
--- a/src/lib/constructs/rfc3394/rfc3394.h
+++ b/src/lib/misc/rfc3394/rfc3394.h
diff --git a/src/lib/constructs/srp6/info.txt b/src/lib/misc/srp6/info.txt
index 1d1c4ba96..5b07264b4 100644
--- a/src/lib/constructs/srp6/info.txt
+++ b/src/lib/misc/srp6/info.txt
@@ -2,6 +2,5 @@ define SRP6 20131128
 
 <requires>
 bigint
-hash
 dl_group
 </requires>
diff --git a/src/lib/constructs/srp6/srp6.cpp b/src/lib/misc/srp6/srp6.cpp
index d3f7338bd..d3f7338bd 100644
--- a/src/lib/constructs/srp6/srp6.cpp
+++ b/src/lib/misc/srp6/srp6.cpp
diff --git a/src/lib/constructs/srp6/srp6.h b/src/lib/misc/srp6/srp6.h
index 3eb21b742..3eb21b742 100644
--- a/src/lib/constructs/srp6/srp6.h
+++ b/src/lib/misc/srp6/srp6.h
diff --git a/src/lib/constructs/srp6/srp6_files.cpp b/src/lib/misc/srp6/srp6_files.cpp
index 50f51fa75..50f51fa75 100644
--- a/src/lib/constructs/srp6/srp6_files.cpp
+++ b/src/lib/misc/srp6/srp6_files.cpp
diff --git a/src/lib/constructs/srp6/srp6_files.h b/src/lib/misc/srp6/srp6_files.h
index 45c3b0bfe..45c3b0bfe 100644
--- a/src/lib/constructs/srp6/srp6_files.h
+++ b/src/lib/misc/srp6/srp6_files.h
diff --git a/src/lib/constructs/tss/info.txt b/src/lib/misc/tss/info.txt
index 0c86bebbe..c4fed288d 100644
--- a/src/lib/constructs/tss/info.txt
+++ b/src/lib/misc/tss/info.txt
@@ -1,7 +1,6 @@
 define THRESHOLD_SECRET_SHARING 20131128
 
 <requires>
-hash
 rng
 filters
 hex
diff --git a/src/lib/constructs/tss/tss.cpp b/src/lib/misc/tss/tss.cpp
index c021bff7b..c021bff7b 100644
--- a/src/lib/constructs/tss/tss.cpp
+++ b/src/lib/misc/tss/tss.cpp
diff --git a/src/lib/constructs/tss/tss.h b/src/lib/misc/tss/tss.h
index 09a5dbe19..09a5dbe19 100644
--- a/src/lib/constructs/tss/tss.h
+++ b/src/lib/misc/tss/tss.h
diff --git a/src/lib/modes/aead/eax/info.txt b/src/lib/modes/aead/eax/info.txt
index 75775fa16..140da5740 100644
--- a/src/lib/modes/aead/eax/info.txt
+++ b/src/lib/modes/aead/eax/info.txt
@@ -1,7 +1,6 @@
 define AEAD_EAX 20131128
 
 <requires>
-block
 cmac
 ctr
 </requires>
diff --git a/src/lib/modes/aead/gcm/info.txt b/src/lib/modes/aead/gcm/info.txt
index cf5f68bb5..708e61fdd 100644
--- a/src/lib/modes/aead/gcm/info.txt
+++ b/src/lib/modes/aead/gcm/info.txt
@@ -1,6 +1,5 @@
 define AEAD_GCM 20131128
 
 <requires>
-block
 ctr
 </requires>
diff --git a/src/lib/modes/aead/ocb/info.txt b/src/lib/modes/aead/ocb/info.txt
index be4cefdd0..a3af9dc29 100644
--- a/src/lib/modes/aead/ocb/info.txt
+++ b/src/lib/modes/aead/ocb/info.txt
@@ -1,6 +1,5 @@
 define AEAD_OCB 20131128
 
 <requires>
-block
 cmac
 </requires>
diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h
index 995870967..53723a730 100644
--- a/src/lib/modes/aead/ocb/ocb.h
+++ b/src/lib/modes/aead/ocb/ocb.h
@@ -10,7 +10,6 @@
 
 #include <botan/aead.h>
 #include <botan/block_cipher.h>
-#include <botan/buf_filt.h>
 
 namespace Botan {
 
diff --git a/src/lib/modes/info.txt b/src/lib/modes/info.txt
index 6ed13e782..bda618e66 100644
--- a/src/lib/modes/info.txt
+++ b/src/lib/modes/info.txt
@@ -1,9 +1,4 @@
 
-<requires>
-block
-stream
-</requires>
-
 <header:public>
 cipher_mode.h
 </header:public>
diff --git a/src/lib/pk_pad/eme_oaep/info.txt b/src/lib/pk_pad/eme_oaep/info.txt
index 7a9360633..a07502159 100644
--- a/src/lib/pk_pad/eme_oaep/info.txt
+++ b/src/lib/pk_pad/eme_oaep/info.txt
@@ -1,8 +1,5 @@
 define EME_OAEP 20140118
 
-load_on auto
-
 <requires>
-hash
 mgf1
 </requires>
diff --git a/src/lib/pk_pad/emsa1/info.txt b/src/lib/pk_pad/emsa1/info.txt
index 83d9744e6..e52afcb1a 100644
--- a/src/lib/pk_pad/emsa1/info.txt
+++ b/src/lib/pk_pad/emsa1/info.txt
@@ -1,5 +1 @@
 define EMSA1 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/pk_pad/emsa_pkcs1/info.txt b/src/lib/pk_pad/emsa_pkcs1/info.txt
index f497b45e3..72f75e41b 100644
--- a/src/lib/pk_pad/emsa_pkcs1/info.txt
+++ b/src/lib/pk_pad/emsa_pkcs1/info.txt
@@ -1,6 +1,5 @@
 define EMSA_PKCS1 20140118
 
 <requires>
-hash
 hash_id
 </requires>
diff --git a/src/lib/pk_pad/emsa_pssr/info.txt b/src/lib/pk_pad/emsa_pssr/info.txt
index 349cc0988..2152b307d 100644
--- a/src/lib/pk_pad/emsa_pssr/info.txt
+++ b/src/lib/pk_pad/emsa_pssr/info.txt
@@ -1,6 +1,5 @@
 define EMSA_PSSR 20131128
 
 <requires>
-hash
 mgf1
 </requires>
diff --git a/src/lib/pk_pad/emsa_x931/info.txt b/src/lib/pk_pad/emsa_x931/info.txt
index 57ff1d2b3..e2e40f144 100644
--- a/src/lib/pk_pad/emsa_x931/info.txt
+++ b/src/lib/pk_pad/emsa_x931/info.txt
@@ -1,6 +1,5 @@
 define EMSA_X931 20140118
 
 <requires>
-hash
 hash_id
 </requires>
diff --git a/src/lib/pk_pad/hash_id/info.txt b/src/lib/pk_pad/hash_id/info.txt
index e6df99b6f..d44e58f77 100644
--- a/src/lib/pk_pad/hash_id/info.txt
+++ b/src/lib/pk_pad/hash_id/info.txt
@@ -1,5 +1 @@
 define HASH_ID 20131128
-
-<requires>
-alloc
-</requires>
diff --git a/src/lib/pk_pad/mgf1/info.txt b/src/lib/pk_pad/mgf1/info.txt
index 65d471c8a..8e20d78df 100644
--- a/src/lib/pk_pad/mgf1/info.txt
+++ b/src/lib/pk_pad/mgf1/info.txt
@@ -1,5 +1 @@
 define MGF1 20140118
-
-<requires>
-hash
-</requires>
diff --git a/src/lib/prf/hkdf/info.txt b/src/lib/prf/hkdf/info.txt
deleted file mode 100644
index 9c7e1fbfd..000000000
--- a/src/lib/prf/hkdf/info.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-define HKDF 20131128
-
-<requires>
-mac
-hash
-</requires>
diff --git a/src/lib/pubkey/info.txt b/src/lib/pubkey/info.txt
index 3ef346c30..655fcaae3 100644
--- a/src/lib/pubkey/info.txt
+++ b/src/lib/pubkey/info.txt
@@ -29,7 +29,6 @@ pk_utils.h
 alloc
 asn1
 bigint
-filters
 kdf
 oid_lookup
 pbes2
diff --git a/src/lib/rng/x931_rng/info.txt b/src/lib/rng/x931_rng/info.txt
index beab0dbfd..b61dc7ec9 100644
--- a/src/lib/rng/x931_rng/info.txt
+++ b/src/lib/rng/x931_rng/info.txt
@@ -1,5 +1 @@
 define X931_RNG 20131128
-
-<requires>
-block
-</requires>
diff --git a/src/lib/stream/chacha/info.txt b/src/lib/stream/chacha/info.txt
index 666f14d53..f3bd1ffe8 100644
--- a/src/lib/stream/chacha/info.txt
+++ b/src/lib/stream/chacha/info.txt
@@ -1,3 +1 @@
 define CHACHA 20140103
-
-load_on auto
diff --git a/src/lib/stream/ctr/info.txt b/src/lib/stream/ctr/info.txt
index 84d90a76f..c0c6694b0 100644
--- a/src/lib/stream/ctr/info.txt
+++ b/src/lib/stream/ctr/info.txt
@@ -1,6 +1 @@
 define CTR_BE 20131128
-
-<requires>
-block
-stream
-</requires>
diff --git a/src/lib/stream/ofb/info.txt b/src/lib/stream/ofb/info.txt
index 11b6bfb27..2d3d78f79 100644
--- a/src/lib/stream/ofb/info.txt
+++ b/src/lib/stream/ofb/info.txt
@@ -1,6 +1 @@
 define OFB 20131128
-
-<requires>
-block
-stream
-</requires>