98 files changed, 482 insertions, 29 deletions

diff --git a/modules/checksum/adler32/modinfo.txt b/modules/checksum/adler32/modinfo.txt
new file mode 100644
index 000000000..fb0f3c9cb
--- /dev/null
+++ b/modules/checksum/adler32/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Adler32"
+
+define ADLER32
+
+load_on auto
+
+<add>
+adler32.cpp
+adler32.h
+</add>
diff --git a/src/aes.cpp b/modules/ciphers/aes/aes.cpp
index 24f1f6213..24f1f6213 100644
--- a/src/aes.cpp
+++ b/modules/ciphers/aes/aes.cpp
diff --git a/include/aes.h b/modules/ciphers/aes/aes.h
index 5b43735ad..5b43735ad 100644
--- a/include/aes.h
+++ b/modules/ciphers/aes/aes.h
diff --git a/src/aes_tab.cpp b/modules/ciphers/aes/aes_tab.cpp
index 3665bb746..3665bb746 100644
--- a/src/aes_tab.cpp
+++ b/modules/ciphers/aes/aes_tab.cpp
diff --git a/modules/ciphers/aes/modinfo.txt b/modules/ciphers/aes/modinfo.txt
new file mode 100644
index 000000000..2803ccc4e
--- /dev/null
+++ b/modules/ciphers/aes/modinfo.txt
@@ -0,0 +1,11 @@
+realname "AES"
+
+define AES
+
+load_on auto
+
+<add>
+aes.cpp
+aes.h
+aes_tab.cpp
+</add>
diff --git a/src/arc4.cpp b/modules/ciphers/arc4/arc4.cpp
index 238567cdc..238567cdc 100644
--- a/src/arc4.cpp
+++ b/modules/ciphers/arc4/arc4.cpp
diff --git a/include/arc4.h b/modules/ciphers/arc4/arc4.h
index c99691484..c99691484 100644
--- a/include/arc4.h
+++ b/modules/ciphers/arc4/arc4.h
diff --git a/modules/ciphers/arc4/modinfo.txt b/modules/ciphers/arc4/modinfo.txt
new file mode 100644
index 000000000..00f40a9ed
--- /dev/null
+++ b/modules/ciphers/arc4/modinfo.txt
@@ -0,0 +1,10 @@
+realname "ARC4"
+
+define ARC4
+
+load_on auto
+
+<add>
+arc4.cpp
+arc4.h
+</add>
diff --git a/src/blfs_tab.cpp b/modules/ciphers/blowfish/blfs_tab.cpp
index f8fa07ee5..f8fa07ee5 100644
--- a/src/blfs_tab.cpp
+++ b/modules/ciphers/blowfish/blfs_tab.cpp
diff --git a/src/blowfish.cpp b/modules/ciphers/blowfish/blowfish.cpp
index ffca9241f..ffca9241f 100644
--- a/src/blowfish.cpp
+++ b/modules/ciphers/blowfish/blowfish.cpp
diff --git a/include/blowfish.h b/modules/ciphers/blowfish/blowfish.h
index 79875ba90..79875ba90 100644
--- a/include/blowfish.h
+++ b/modules/ciphers/blowfish/blowfish.h
diff --git a/modules/ciphers/blowfish/modinfo.txt b/modules/ciphers/blowfish/modinfo.txt
new file mode 100644
index 000000000..0a9d2adc2
--- /dev/null
+++ b/modules/ciphers/blowfish/modinfo.txt
@@ -0,0 +1,11 @@
+realname "Blowfish"
+
+define BLOWFISH
+
+load_on auto
+
+<add>
+blfs_tab.cpp
+blowfish.cpp
+blowfish.h
+</add>
diff --git a/src/cast128.cpp b/modules/ciphers/cast/cast128.cpp
index 14e5c9e9d..14e5c9e9d 100644
--- a/src/cast128.cpp
+++ b/modules/ciphers/cast/cast128.cpp
diff --git a/include/cast128.h b/modules/ciphers/cast/cast128.h
index 0a7c53864..0a7c53864 100644
--- a/include/cast128.h
+++ b/modules/ciphers/cast/cast128.h
diff --git a/src/cast256.cpp b/modules/ciphers/cast/cast256.cpp
index 24d3e0078..24d3e0078 100644
--- a/src/cast256.cpp
+++ b/modules/ciphers/cast/cast256.cpp
diff --git a/include/cast256.h b/modules/ciphers/cast/cast256.h
index d4b7c6b18..d4b7c6b18 100644
--- a/include/cast256.h
+++ b/modules/ciphers/cast/cast256.h
diff --git a/src/cast_tab.cpp b/modules/ciphers/cast/cast_tab.cpp
index 3edab713f..3edab713f 100644
--- a/src/cast_tab.cpp
+++ b/modules/ciphers/cast/cast_tab.cpp
diff --git a/modules/ciphers/cast/modinfo.txt b/modules/ciphers/cast/modinfo.txt
new file mode 100644
index 000000000..e6d88ed2e
--- /dev/null
+++ b/modules/ciphers/cast/modinfo.txt
@@ -0,0 +1,14 @@
+realname "CAST"
+
+define CAST_128
+define CAST_256
+
+load_on auto
+
+<add>
+cast128.cpp
+cast128.h
+cast256.cpp
+cast256.h
+cast_tab.cpp
+</add>
diff --git a/src/des.cpp b/modules/ciphers/des/des.cpp
index d09752854..d09752854 100644
--- a/src/des.cpp
+++ b/modules/ciphers/des/des.cpp
diff --git a/include/des.h b/modules/ciphers/des/des.h
index 3e53a6166..3e53a6166 100644
--- a/include/des.h
+++ b/modules/ciphers/des/des.h
diff --git a/src/des_tab.cpp b/modules/ciphers/des/des_tab.cpp
index 9788cd8c0..9788cd8c0 100644
--- a/src/des_tab.cpp
+++ b/modules/ciphers/des/des_tab.cpp
diff --git a/modules/ciphers/des/modinfo.txt b/modules/ciphers/des/modinfo.txt
new file mode 100644
index 000000000..43ea9a0bc
--- /dev/null
+++ b/modules/ciphers/des/modinfo.txt
@@ -0,0 +1,11 @@
+realname "DES"
+
+define DES
+
+load_on auto
+
+<add>
+des.cpp
+des.h
+des_tab.cpp
+</add>
diff --git a/src/gost.cpp b/modules/ciphers/gost/gost.cpp
index dc2b397e7..dc2b397e7 100644
--- a/src/gost.cpp
+++ b/modules/ciphers/gost/gost.cpp
diff --git a/include/gost.h b/modules/ciphers/gost/gost.h
index d78e3245f..d78e3245f 100644
--- a/include/gost.h
+++ b/modules/ciphers/gost/gost.h
diff --git a/src/gost_tab.cpp b/modules/ciphers/gost/gost_tab.cpp
index 3ef1a0caf..3ef1a0caf 100644
--- a/src/gost_tab.cpp
+++ b/modules/ciphers/gost/gost_tab.cpp
diff --git a/modules/ciphers/gost/modinfo.txt b/modules/ciphers/gost/modinfo.txt
new file mode 100644
index 000000000..f2b997c08
--- /dev/null
+++ b/modules/ciphers/gost/modinfo.txt
@@ -0,0 +1,11 @@
+realname "GOST"
+
+define GOST
+
+load_on auto
+
+<add>
+gost.cpp
+gost.h
+gost_tab.cpp
+</add>
diff --git a/src/idea.cpp b/modules/ciphers/idea/idea.cpp
index a2b076015..a2b076015 100644
--- a/src/idea.cpp
+++ b/modules/ciphers/idea/idea.cpp
diff --git a/include/idea.h b/modules/ciphers/idea/idea.h
index 4c5e82aca..4c5e82aca 100644
--- a/include/idea.h
+++ b/modules/ciphers/idea/idea.h
diff --git a/modules/ciphers/idea/modinfo.txt b/modules/ciphers/idea/modinfo.txt
new file mode 100644
index 000000000..2da3ffb43
--- /dev/null
+++ b/modules/ciphers/idea/modinfo.txt
@@ -0,0 +1,10 @@
+realname "IDEA"
+
+define IDEA
+
+load_on auto
+
+<add>
+idea.cpp
+idea.h
+</add>
diff --git a/src/kas_tab.cpp b/modules/ciphers/kasumi/kas_tab.cpp
index 74a7bc06e..74a7bc06e 100644
--- a/src/kas_tab.cpp
+++ b/modules/ciphers/kasumi/kas_tab.cpp
diff --git a/src/kasumi.cpp b/modules/ciphers/kasumi/kasumi.cpp
index 4e2cba27b..4e2cba27b 100644
--- a/src/kasumi.cpp
+++ b/modules/ciphers/kasumi/kasumi.cpp
diff --git a/include/kasumi.h b/modules/ciphers/kasumi/kasumi.h
index 58888d909..58888d909 100644
--- a/include/kasumi.h
+++ b/modules/ciphers/kasumi/kasumi.h
diff --git a/modules/ciphers/kasumi/modinfo.txt b/modules/ciphers/kasumi/modinfo.txt
new file mode 100644
index 000000000..3ca5de20a
--- /dev/null
+++ b/modules/ciphers/kasumi/modinfo.txt
@@ -0,0 +1,11 @@
+realname "Kasumi"
+
+define KASUMI
+
+load_on auto
+
+<add>
+kas_tab.cpp
+kasumi.cpp
+kasumi.h
+</add>
diff --git a/src/lion.cpp b/modules/ciphers/lion/lion.cpp
index 009e98408..009e98408 100644
--- a/src/lion.cpp
+++ b/modules/ciphers/lion/lion.cpp
diff --git a/include/lion.h b/modules/ciphers/lion/lion.h
index 70018838a..70018838a 100644
--- a/include/lion.h
+++ b/modules/ciphers/lion/lion.h
diff --git a/modules/ciphers/lion/modinfo.txt b/modules/ciphers/lion/modinfo.txt
new file mode 100644
index 000000000..558d71d0c
--- /dev/null
+++ b/modules/ciphers/lion/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Lion"
+
+define LION
+
+load_on auto
+
+<add>
+lion.cpp
+lion.h
+</add>
diff --git a/src/lubyrack.cpp b/modules/ciphers/lubyrack/lubyrack.cpp
index c9e6fc531..c9e6fc531 100644
--- a/src/lubyrack.cpp
+++ b/modules/ciphers/lubyrack/lubyrack.cpp
diff --git a/include/lubyrack.h b/modules/ciphers/lubyrack/lubyrack.h
index 2c4813cb6..2c4813cb6 100644
--- a/include/lubyrack.h
+++ b/modules/ciphers/lubyrack/lubyrack.h
diff --git a/modules/ciphers/lubyrack/modinfo.txt b/modules/ciphers/lubyrack/modinfo.txt
new file mode 100644
index 000000000..d83df2409
--- /dev/null
+++ b/modules/ciphers/lubyrack/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Luby-Rackoff"
+
+define LUBY_RACKOFF
+
+load_on auto
+
+<add>
+lubyrack.cpp
+lubyrack.h
+</add>
diff --git a/src/mars.cpp b/modules/ciphers/mars/mars.cpp
index cc671fc06..cc671fc06 100644
--- a/src/mars.cpp
+++ b/modules/ciphers/mars/mars.cpp
diff --git a/include/mars.h b/modules/ciphers/mars/mars.h
index 6e1bc9f34..6e1bc9f34 100644
--- a/include/mars.h
+++ b/modules/ciphers/mars/mars.h
diff --git a/src/mars_tab.cpp b/modules/ciphers/mars/mars_tab.cpp
index 07381e9cb..07381e9cb 100644
--- a/src/mars_tab.cpp
+++ b/modules/ciphers/mars/mars_tab.cpp
diff --git a/modules/ciphers/mars/modinfo.txt b/modules/ciphers/mars/modinfo.txt
new file mode 100644
index 000000000..b0ad8af9c
--- /dev/null
+++ b/modules/ciphers/mars/modinfo.txt
@@ -0,0 +1,11 @@
+realname "MARS"
+
+define MARS
+
+load_on auto
+
+<add>
+mars.cpp
+mars.h
+mars_tab.cpp
+</add>
diff --git a/src/mist_tab.cpp b/modules/ciphers/misty1/mist_tab.cpp
index b72742fb3..b72742fb3 100644
--- a/src/mist_tab.cpp
+++ b/modules/ciphers/misty1/mist_tab.cpp
diff --git a/src/misty1.cpp b/modules/ciphers/misty1/misty1.cpp
index 523d11c84..523d11c84 100644
--- a/src/misty1.cpp
+++ b/modules/ciphers/misty1/misty1.cpp
diff --git a/include/misty1.h b/modules/ciphers/misty1/misty1.h
index 9e506d536..9e506d536 100644
--- a/include/misty1.h
+++ b/modules/ciphers/misty1/misty1.h
diff --git a/modules/ciphers/misty1/modinfo.txt b/modules/ciphers/misty1/modinfo.txt
new file mode 100644
index 000000000..36600e5fe
--- /dev/null
+++ b/modules/ciphers/misty1/modinfo.txt
@@ -0,0 +1,11 @@
+realname "MISTY-1"
+
+define MISTY1
+
+load_on auto
+
+<add>
+mist_tab.cpp
+misty1.cpp
+misty1.h
+</add>
diff --git a/modules/ciphers/noekeon/modinfo.txt b/modules/ciphers/noekeon/modinfo.txt
new file mode 100644
index 000000000..8025c2073
--- /dev/null
+++ b/modules/ciphers/noekeon/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Noekeon"
+
+define NOEKEON
+
+load_on auto
+
+<add>
+noekeon.cpp
+noekeon.h
+</add>
diff --git a/src/noekeon.cpp b/modules/ciphers/noekeon/noekeon.cpp
index 437972fe5..437972fe5 100644
--- a/src/noekeon.cpp
+++ b/modules/ciphers/noekeon/noekeon.cpp
diff --git a/include/noekeon.h b/modules/ciphers/noekeon/noekeon.h
index 660ab487a..660ab487a 100644
--- a/include/noekeon.h
+++ b/modules/ciphers/noekeon/noekeon.h
diff --git a/modules/ciphers/rc2/modinfo.txt b/modules/ciphers/rc2/modinfo.txt
new file mode 100644
index 000000000..099141de7
--- /dev/null
+++ b/modules/ciphers/rc2/modinfo.txt
@@ -0,0 +1,10 @@
+realname "RC2"
+
+define RC2
+
+load_on auto
+
+<add>
+rc2.cpp
+rc2.h
+</add>
diff --git a/src/rc2.cpp b/modules/ciphers/rc2/rc2.cpp
index 6d764e5c4..6d764e5c4 100644
--- a/src/rc2.cpp
+++ b/modules/ciphers/rc2/rc2.cpp
diff --git a/include/rc2.h b/modules/ciphers/rc2/rc2.h
index 8f46821a4..8f46821a4 100644
--- a/include/rc2.h
+++ b/modules/ciphers/rc2/rc2.h
diff --git a/modules/ciphers/rc5/modinfo.txt b/modules/ciphers/rc5/modinfo.txt
new file mode 100644
index 000000000..4a150c3b0
--- /dev/null
+++ b/modules/ciphers/rc5/modinfo.txt
@@ -0,0 +1,10 @@
+realname "RC5"
+
+define RC5
+
+load_on auto
+
+<add>
+rc5.cpp
+rc5.h
+</add>
diff --git a/src/rc5.cpp b/modules/ciphers/rc5/rc5.cpp
index 0c0229b6c..0c0229b6c 100644
--- a/src/rc5.cpp
+++ b/modules/ciphers/rc5/rc5.cpp
diff --git a/include/rc5.h b/modules/ciphers/rc5/rc5.h
index 0827048dc..0827048dc 100644
--- a/include/rc5.h
+++ b/modules/ciphers/rc5/rc5.h
diff --git a/modules/ciphers/rc6/modinfo.txt b/modules/ciphers/rc6/modinfo.txt
new file mode 100644
index 000000000..1457e78c1
--- /dev/null
+++ b/modules/ciphers/rc6/modinfo.txt
@@ -0,0 +1,10 @@
+realname "RC6"
+
+define RC6
+
+load_on auto
+
+<add>
+rc6.cpp
+rc6.h
+</add>
diff --git a/src/rc6.cpp b/modules/ciphers/rc6/rc6.cpp
index 67d765222..67d765222 100644
--- a/src/rc6.cpp
+++ b/modules/ciphers/rc6/rc6.cpp
diff --git a/include/rc6.h b/modules/ciphers/rc6/rc6.h
index d629b0995..d629b0995 100644
--- a/include/rc6.h
+++ b/modules/ciphers/rc6/rc6.h
diff --git a/modules/ciphers/safer/modinfo.txt b/modules/ciphers/safer/modinfo.txt
new file mode 100644
index 000000000..973cbff19
--- /dev/null
+++ b/modules/ciphers/safer/modinfo.txt
@@ -0,0 +1,11 @@
+realname "SAFER"
+
+define SAFER
+
+load_on auto
+
+<add>
+safe_tab.cpp
+safer_sk.cpp
+safer_sk.h
+</add>
diff --git a/src/safe_tab.cpp b/modules/ciphers/safer/safe_tab.cpp
index 06de7fa49..06de7fa49 100644
--- a/src/safe_tab.cpp
+++ b/modules/ciphers/safer/safe_tab.cpp
diff --git a/src/safer_sk.cpp b/modules/ciphers/safer/safer_sk.cpp
index 639130714..639130714 100644
--- a/src/safer_sk.cpp
+++ b/modules/ciphers/safer/safer_sk.cpp
diff --git a/include/safer_sk.h b/modules/ciphers/safer/safer_sk.h
index 1bc65e2f7..1bc65e2f7 100644
--- a/include/safer_sk.h
+++ b/modules/ciphers/safer/safer_sk.h
diff --git a/modules/ciphers/salsa20/modinfo.txt b/modules/ciphers/salsa20/modinfo.txt
new file mode 100644
index 000000000..de1683643
--- /dev/null
+++ b/modules/ciphers/salsa20/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Salsa20"
+
+define SALSA20
+
+load_on auto
+
+<add>
+salsa20.cpp
+salsa20.h
+</add>
diff --git a/src/salsa20.cpp b/modules/ciphers/salsa20/salsa20.cpp
index d11ba8799..d11ba8799 100644
--- a/src/salsa20.cpp
+++ b/modules/ciphers/salsa20/salsa20.cpp
diff --git a/include/salsa20.h b/modules/ciphers/salsa20/salsa20.h
index e107d8569..e107d8569 100644
--- a/include/salsa20.h
+++ b/modules/ciphers/salsa20/salsa20.h
diff --git a/modules/ciphers/seed/modinfo.txt b/modules/ciphers/seed/modinfo.txt
new file mode 100644
index 000000000..d04979335
--- /dev/null
+++ b/modules/ciphers/seed/modinfo.txt
@@ -0,0 +1,11 @@
+realname "SEED"
+
+define SEED
+
+load_on auto
+
+<add>
+seed.cpp
+seed.h
+seed_tab.cpp
+</add>
diff --git a/src/seed.cpp b/modules/ciphers/seed/seed.cpp
index ecb6a86fa..ecb6a86fa 100644
--- a/src/seed.cpp
+++ b/modules/ciphers/seed/seed.cpp
diff --git a/include/seed.h b/modules/ciphers/seed/seed.h
index 95ddbe1d5..95ddbe1d5 100644
--- a/include/seed.h
+++ b/modules/ciphers/seed/seed.h
diff --git a/src/seed_tab.cpp b/modules/ciphers/seed/seed_tab.cpp
index 5880f0489..5880f0489 100644
--- a/src/seed_tab.cpp
+++ b/modules/ciphers/seed/seed_tab.cpp
diff --git a/modules/ciphers/serpent/modinfo.txt b/modules/ciphers/serpent/modinfo.txt
new file mode 100644
index 000000000..baaccbf01
--- /dev/null
+++ b/modules/ciphers/serpent/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Serpent"
+
+define SERPENT
+
+load_on auto
+
+<add>
+serpent.cpp
+serpent.h
+</add>
diff --git a/src/serpent.cpp b/modules/ciphers/serpent/serpent.cpp
index 997daa8b1..997daa8b1 100644
--- a/src/serpent.cpp
+++ b/modules/ciphers/serpent/serpent.cpp
diff --git a/include/serpent.h b/modules/ciphers/serpent/serpent.h
index 685470e4c..685470e4c 100644
--- a/include/serpent.h
+++ b/modules/ciphers/serpent/serpent.h
diff --git a/modules/ciphers/skipjack/modinfo.txt b/modules/ciphers/skipjack/modinfo.txt
new file mode 100644
index 000000000..4b38d6d28
--- /dev/null
+++ b/modules/ciphers/skipjack/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Skipjack"
+
+define SKIPJACK
+
+load_on auto
+
+<add>
+skipjack.cpp
+skipjack.h
+</add>
diff --git a/src/skipjack.cpp b/modules/ciphers/skipjack/skipjack.cpp
index 3cad75436..3cad75436 100644
--- a/src/skipjack.cpp
+++ b/modules/ciphers/skipjack/skipjack.cpp
diff --git a/include/skipjack.h b/modules/ciphers/skipjack/skipjack.h
index 240148f19..240148f19 100644
--- a/include/skipjack.h
+++ b/modules/ciphers/skipjack/skipjack.h
diff --git a/modules/ciphers/square/modinfo.txt b/modules/ciphers/square/modinfo.txt
new file mode 100644
index 000000000..a20697923
--- /dev/null
+++ b/modules/ciphers/square/modinfo.txt
@@ -0,0 +1,11 @@
+realname "Square"
+
+define SQUARE
+
+load_on auto
+
+<add>
+sqr_tab.cpp
+square.cpp
+square.h
+</add>
diff --git a/src/sqr_tab.cpp b/modules/ciphers/square/sqr_tab.cpp
index 248ace4cd..248ace4cd 100644
--- a/src/sqr_tab.cpp
+++ b/modules/ciphers/square/sqr_tab.cpp
diff --git a/src/square.cpp b/modules/ciphers/square/square.cpp
index f2b15499b..f2b15499b 100644
--- a/src/square.cpp
+++ b/modules/ciphers/square/square.cpp
diff --git a/include/square.h b/modules/ciphers/square/square.h
index efbc6e730..efbc6e730 100644
--- a/include/square.h
+++ b/modules/ciphers/square/square.h
diff --git a/modules/ciphers/tea/modinfo.txt b/modules/ciphers/tea/modinfo.txt
new file mode 100644
index 000000000..6a0e76b15
--- /dev/null
+++ b/modules/ciphers/tea/modinfo.txt
@@ -0,0 +1,10 @@
+realname "TEA"
+
+define TEA
+
+load_on auto
+
+<add>
+tea.cpp
+tea.h
+</add>
diff --git a/src/tea.cpp b/modules/ciphers/tea/tea.cpp
index c5bd1b1fa..c5bd1b1fa 100644
--- a/src/tea.cpp
+++ b/modules/ciphers/tea/tea.cpp
diff --git a/include/tea.h b/modules/ciphers/tea/tea.h
index 2fc9fe838..2fc9fe838 100644
--- a/include/tea.h
+++ b/modules/ciphers/tea/tea.h
diff --git a/modules/ciphers/turing/modinfo.txt b/modules/ciphers/turing/modinfo.txt
new file mode 100644
index 000000000..95ae2cf48
--- /dev/null
+++ b/modules/ciphers/turing/modinfo.txt
@@ -0,0 +1,11 @@
+realname "Turing"
+
+define TURING
+
+load_on auto
+
+<add>
+tur_tab.cpp
+turing.cpp
+turing.h
+</add>
diff --git a/src/tur_tab.cpp b/modules/ciphers/turing/tur_tab.cpp
index 08793f59d..08793f59d 100644
--- a/src/tur_tab.cpp
+++ b/modules/ciphers/turing/tur_tab.cpp
diff --git a/src/turing.cpp b/modules/ciphers/turing/turing.cpp
index 017b5cf1d..017b5cf1d 100644
--- a/src/turing.cpp
+++ b/modules/ciphers/turing/turing.cpp
diff --git a/include/turing.h b/modules/ciphers/turing/turing.h
index 14b2e6fd6..14b2e6fd6 100644
--- a/include/turing.h
+++ b/modules/ciphers/turing/turing.h
diff --git a/modules/ciphers/twofish/modinfo.txt b/modules/ciphers/twofish/modinfo.txt
new file mode 100644
index 000000000..35639d858
--- /dev/null
+++ b/modules/ciphers/twofish/modinfo.txt
@@ -0,0 +1,11 @@
+realname "Twofish"
+
+define TWOFISH
+
+load_on auto
+
+<add>
+two_tab.cpp
+twofish.cpp
+twofish.h
+</add>
diff --git a/src/two_tab.cpp b/modules/ciphers/twofish/two_tab.cpp
index 7d349312b..7d349312b 100644
--- a/src/two_tab.cpp
+++ b/modules/ciphers/twofish/two_tab.cpp
diff --git a/src/twofish.cpp b/modules/ciphers/twofish/twofish.cpp
index b2357e347..b2357e347 100644
--- a/src/twofish.cpp
+++ b/modules/ciphers/twofish/twofish.cpp
diff --git a/include/twofish.h b/modules/ciphers/twofish/twofish.h
index 8519a9aa8..8519a9aa8 100644
--- a/include/twofish.h
+++ b/modules/ciphers/twofish/twofish.h
diff --git a/modules/ciphers/wid_wake/modinfo.txt b/modules/ciphers/wid_wake/modinfo.txt
new file mode 100644
index 000000000..299ebfdd7
--- /dev/null
+++ b/modules/ciphers/wid_wake/modinfo.txt
@@ -0,0 +1,10 @@
+realname "WiderWake"
+
+define WID_WAKE
+
+load_on auto
+
+<add>
+wid_wake.cpp
+wid_wake.h
+</add>
diff --git a/src/wid_wake.cpp b/modules/ciphers/wid_wake/wid_wake.cpp
index d7ebdece0..d7ebdece0 100644
--- a/src/wid_wake.cpp
+++ b/modules/ciphers/wid_wake/wid_wake.cpp
diff --git a/include/wid_wake.h b/modules/ciphers/wid_wake/wid_wake.h
index 09171a8f5..09171a8f5 100644
--- a/include/wid_wake.h
+++ b/modules/ciphers/wid_wake/wid_wake.h
diff --git a/modules/ciphers/xtea/modinfo.txt b/modules/ciphers/xtea/modinfo.txt
new file mode 100644
index 000000000..0120a3bce
--- /dev/null
+++ b/modules/ciphers/xtea/modinfo.txt
@@ -0,0 +1,10 @@
+realname "XTEA"
+
+define XTEA
+
+load_on auto
+
+<add>
+xtea.cpp
+xtea.h
+</add>
diff --git a/src/xtea.cpp b/modules/ciphers/xtea/xtea.cpp
index db5c7effc..db5c7effc 100644
--- a/src/xtea.cpp
+++ b/modules/ciphers/xtea/xtea.cpp
diff --git a/include/xtea.h b/modules/ciphers/xtea/xtea.h
index 193c13bb9..193c13bb9 100644
--- a/include/xtea.h
+++ b/modules/ciphers/xtea/xtea.h
diff --git a/src/def_alg.cpp b/src/def_alg.cpp
index 835aa03e2..d719cfa05 100644
--- a/src/def_alg.cpp
+++ b/src/def_alg.cpp
@@ -7,35 +7,114 @@
 #include <botan/libstate.h>
 #include <botan/parsing.h>
 
-#include <botan/aes.h>
-#include <botan/blowfish.h>
-#include <botan/cast128.h>
-#include <botan/cast256.h>
-#include <botan/des.h>
-#include <botan/gost.h>
-#include <botan/idea.h>
-#include <botan/kasumi.h>
-#include <botan/lion.h>
-#include <botan/lubyrack.h>
-#include <botan/mars.h>
-#include <botan/misty1.h>
-#include <botan/noekeon.h>
-#include <botan/rc2.h>
-#include <botan/rc5.h>
-#include <botan/rc6.h>
-#include <botan/safer_sk.h>
-#include <botan/seed.h>
-#include <botan/serpent.h>
-#include <botan/skipjack.h>
-#include <botan/square.h>
-#include <botan/tea.h>
-#include <botan/twofish.h>
-#include <botan/xtea.h>
-
-#include <botan/arc4.h>
-#include <botan/salsa20.h>
-#include <botan/turing.h>
-#include <botan/wid_wake.h>
+#ifdef BOTAN_HAS_AES
+   #include <botan/aes.h>
+#endif
+
+#ifdef BOTAN_HAS_BLOWFISH
+   #include <botan/blowfish.h>
+#endif
+
+#ifdef BOTAN_HAS_CAST
+   #include <botan/cast128.h>
+   #include <botan/cast256.h>
+#endif
+
+#ifdef BOTAN_HAS_DES
+   #include <botan/des.h>
+#endif
+
+#ifdef BOTAN_HAS_GOST
+   #include <botan/gost.h>
+#endif
+
+#ifdef BOTAN_HAS_IDEA
+   #include <botan/idea.h>
+#endif
+
+#ifdef BOTAN_HAS_KASUMI
+   #include <botan/kasumi.h>
+#endif
+
+#ifdef BOTAN_HAS_LION
+   #include <botan/lion.h>
+#endif
+
+#ifdef BOTAN_HAS_LUBYRACK
+   #include <botan/lubyrack.h>
+#endif
+
+#ifdef BOTAN_HAS_MARS
+   #include <botan/mars.h>
+#endif
+
+#ifdef BOTAN_HAS_MISTY1
+   #include <botan/misty1.h>
+#endif
+
+#ifdef BOTAN_HAS_NOEKEON
+   #include <botan/noekeon.h>
+#endif
+
+#ifdef BOTAN_HAS_RC2
+   #include <botan/rc2.h>
+#endif
+
+#ifdef BOTAN_HAS_RC5
+   #include <botan/rc5.h>
+#endif
+
+#ifdef BOTAN_HAS_RC6
+   #include <botan/rc6.h>
+#endif
+
+#ifdef BOTAN_HAS_SAFER
+   #include <botan/safer_sk.h>
+#endif
+
+#ifdef BOTAN_HAS_SEED
+   #include <botan/seed.h>
+#endif
+
+#ifdef BOTAN_HAS_SERPENT
+   #include <botan/serpent.h>
+#endif
+
+#ifdef BOTAN_HAS_SKIPJACK
+   #include <botan/skipjack.h>
+#endif
+
+#ifdef BOTAN_HAS_SQUARE
+   #include <botan/square.h>
+#endif
+
+#ifdef BOTAN_HAS_TEA
+   #include <botan/tea.h>
+#endif
+
+#ifdef BOTAN_HAS_TWOFISH
+   #include <botan/twofish.h>
+#endif
+
+#ifdef BOTAN_HAS_XTEA
+   #include <botan/xtea.h>
+#endif
+
+#ifdef BOTAN_HAS_ARC4
+   #include <botan/arc4.h>
+#endif
+
+#ifdef BOTAN_HAS_SALSA20
+   #include <botan/salsa20.h>
+#endif
+
+#ifdef BOTAN_HAS_TURING
+   #include <botan/turing.h>
+#endif
+
+#ifdef BOTAN_HAS_WID_WAKE
+   #include <botan/wid_wake.h>
+#endif
 
 #ifdef BOTAN_HAS_ADLER32
   #include <botan/adler32.h>
@@ -121,47 +200,114 @@ Default_Engine::find_block_cipher(const std::string& algo_spec) const
       return 0;
    const std::string algo_name = global_state().deref_alias(name[0]);
 
+#ifdef BOTAN_HAS_AES
    HANDLE_TYPE_NO_ARGS("AES", AES);
    HANDLE_TYPE_NO_ARGS("AES-128", AES_128);
    HANDLE_TYPE_NO_ARGS("AES-192", AES_192);
    HANDLE_TYPE_NO_ARGS("AES-256", AES_256);
+#endif
+
+#ifdef BOTAN_HAS_BLOWFISH
    HANDLE_TYPE_NO_ARGS("Blowfish", Blowfish);
+#endif
+
+#ifdef BOTAN_HAS_CAST
    HANDLE_TYPE_NO_ARGS("CAST-128", CAST_128);
    HANDLE_TYPE_NO_ARGS("CAST-256", CAST_256);
+#endif
+
+#ifdef BOTAN_HAS_DES
    HANDLE_TYPE_NO_ARGS("DES", DES);
    HANDLE_TYPE_NO_ARGS("DESX", DESX);
    HANDLE_TYPE_NO_ARGS("TripleDES", TripleDES);
+#endif
+
+#ifdef BOTAN_HAS_GOST
    HANDLE_TYPE_NO_ARGS("GOST", GOST);
+#endif
+
+#ifdef BOTAN_HAS_IDEA
    HANDLE_TYPE_NO_ARGS("IDEA", IDEA);
+#endif
+
+#ifdef BOTAN_HAS_KASUMI
    HANDLE_TYPE_NO_ARGS("KASUMI", KASUMI);
+#endif
+
+#ifdef BOTAN_HAS_MARS
    HANDLE_TYPE_NO_ARGS("MARS", MARS);
+#endif
+
+#ifdef BOTAN_HAS_MISTY1
    HANDLE_TYPE_ONE_U32BIT("MISTY1", MISTY1, 8);
+#endif
+
+#ifdef BOTAN_HAS_NOEKEON
    HANDLE_TYPE_NO_ARGS("Noekeon", Noekeon);
+#endif
+
+#ifdef BOTAN_HAS_RC2
    HANDLE_TYPE_NO_ARGS("RC2", RC2);
+#endif
+
+#ifdef BOTAN_HAS_RC5
    HANDLE_TYPE_ONE_U32BIT("RC5", RC5, 12);
+#endif
+
+#ifdef BOTAN_HAS_RC6
    HANDLE_TYPE_NO_ARGS("RC6", RC6);
+#endif
+
+#ifdef BOTAN_HAS_SAFER
    HANDLE_TYPE_ONE_U32BIT("SAFER-SK", SAFER_SK, 10);
+#endif
+
+#ifdef BOTAN_HAS_SEED
    HANDLE_TYPE_NO_ARGS("SEED", SEED);
+#endif
+
+#ifdef BOTAN_HAS_SERPENT
    HANDLE_TYPE_NO_ARGS("Serpent", Serpent);
+#endif
+
+#ifdef BOTAN_HAS_SKIPJACK
    HANDLE_TYPE_NO_ARGS("Skipjack", Skipjack);
+#endif
+
+#ifdef BOTAN_HAS_SQUARE
    HANDLE_TYPE_NO_ARGS("Square", Square);
+#endif
+
+#ifdef BOTAN_HAS_TEA
    HANDLE_TYPE_NO_ARGS("TEA", TEA);
+#endif
+
+#ifdef BOTAN_HAS_TWOFISH
    HANDLE_TYPE_NO_ARGS("Twofish", Twofish);
+#endif
+
+#ifdef BOTAN_HAS_XTEA
    HANDLE_TYPE_NO_ARGS("XTEA", XTEA);
+#endif
 
+#ifdef BOTAN_HAS_LUBY_RACKOFF
    if(algo_name == "Luby-Rackoff" && name.size() >= 2)
       {
       HashFunction* hash = find_hash(name[1]);
       if(hash)
          return new LubyRackoff(hash);
       }
+#endif
 
+#ifdef BOTAN_HAS_LION
    if(algo_name == "Lion")
       {
       if(name.size() != 4)
          throw Invalid_Algorithm_Name(algo_spec);
       return new Lion(name[1], name[2], to_u32bit(name[3]));
       }
+#endif
+
    return 0;
    }
 
@@ -176,11 +322,22 @@ Default_Engine::find_stream_cipher(const std::string& algo_spec) const
       return 0;
    const std::string algo_name = global_state().deref_alias(name[0]);
 
+#ifdef BOTAN_HAS_ARC4
    HANDLE_TYPE_ONE_U32BIT("ARC4", ARC4, 0);
    HANDLE_TYPE_ONE_U32BIT("RC4_drop", ARC4, 768);
+#endif
+
+#ifdef BOTAN_HAS_SALSA20
    HANDLE_TYPE_NO_ARGS("Salsa20", Salsa20);
+#endif
+
+#ifdef BOTAN_HAS_TURING
    HANDLE_TYPE_NO_ARGS("Turing", Turing);
+#endif
+
+#ifdef BOTAN_HAS_WID_WAKE
    HANDLE_TYPE_NO_ARGS("WiderWake4+1-BE", WiderWake_41_BE);
+#endif
 
    return 0;
    }