aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/algo_factory/info.txt2
-rw-r--r--src/alloc/alloc_mmap/info.txt2
-rw-r--r--src/alloc/info.txt2
-rw-r--r--src/alloc/mem_pool/info.txt2
-rw-r--r--src/alloc/system_alloc/info.txt2
-rw-r--r--src/aont/info.txt2
-rw-r--r--src/asn1/info.txt2
-rw-r--r--src/benchmark/info.txt2
-rw-r--r--src/block/aes/info.txt2
-rw-r--r--src/block/blowfish/info.txt2
-rw-r--r--src/block/cast/info.txt2
-rw-r--r--src/block/des/info.txt2
-rw-r--r--src/block/gost_28147/info.txt2
-rw-r--r--src/block/idea/info.txt2
-rw-r--r--src/block/info.txt2
-rw-r--r--src/block/kasumi/info.txt2
-rw-r--r--src/block/lion/info.txt2
-rw-r--r--src/block/lubyrack/info.txt2
-rw-r--r--src/block/mars/info.txt2
-rw-r--r--src/block/misty1/info.txt2
-rw-r--r--src/block/noekeon/info.txt2
-rw-r--r--src/block/rc2/info.txt2
-rw-r--r--src/block/rc5/info.txt2
-rw-r--r--src/block/rc6/info.txt2
-rw-r--r--src/block/safer/info.txt2
-rw-r--r--src/block/seed/info.txt2
-rw-r--r--src/block/serpent/info.txt2
-rw-r--r--src/block/serpent_ia32/info.txt2
-rw-r--r--src/block/serpent_sse2/info.txt2
-rw-r--r--src/block/skipjack/info.txt2
-rw-r--r--src/block/square/info.txt2
-rw-r--r--src/block/tea/info.txt2
-rw-r--r--src/block/twofish/info.txt2
-rw-r--r--src/block/xtea/info.txt2
-rw-r--r--src/build-data/arch/alpha.txt2
-rw-r--r--src/build-data/arch/amd64.txt2
-rw-r--r--src/build-data/arch/arm.txt2
-rw-r--r--src/build-data/arch/hitachi-sh.txt2
-rw-r--r--src/build-data/arch/hppa.txt2
-rw-r--r--src/build-data/arch/ia32.txt2
-rw-r--r--src/build-data/arch/ia64.txt2
-rw-r--r--src/build-data/arch/m68k.txt2
-rw-r--r--src/build-data/arch/mips32.txt2
-rw-r--r--src/build-data/arch/mips64.txt2
-rw-r--r--src/build-data/arch/ppc.txt2
-rw-r--r--src/build-data/arch/ppc64.txt2
-rw-r--r--src/build-data/arch/s390.txt2
-rw-r--r--src/build-data/arch/s390x.txt2
-rw-r--r--src/build-data/arch/sparc32.txt3
-rw-r--r--src/build-data/arch/sparc64.txt2
-rw-r--r--src/build-data/cc/bcc.txt2
-rw-r--r--src/build-data/cc/clang.txt2
-rw-r--r--src/build-data/cc/compaq.txt2
-rw-r--r--src/build-data/cc/ekopath.txt2
-rw-r--r--src/build-data/cc/gcc.txt2
-rw-r--r--src/build-data/cc/hpcc.txt2
-rw-r--r--src/build-data/cc/icc.txt2
-rw-r--r--src/build-data/cc/kai.txt2
-rw-r--r--src/build-data/cc/mipspro.txt2
-rw-r--r--src/build-data/cc/msvc.txt2
-rw-r--r--src/build-data/cc/open64.txt2
-rw-r--r--src/build-data/cc/pgi.txt2
-rw-r--r--src/build-data/cc/sgipro64.txt2
-rw-r--r--src/build-data/cc/sunwspro.txt2
-rw-r--r--src/build-data/cc/xlc.txt2
-rw-r--r--src/build-data/os/aix.txt2
-rw-r--r--src/build-data/os/beos.txt2
-rw-r--r--src/build-data/os/cygwin.txt2
-rw-r--r--src/build-data/os/darwin.txt2
-rw-r--r--src/build-data/os/dragonfly.txt2
-rw-r--r--src/build-data/os/freebsd.txt2
-rw-r--r--src/build-data/os/hpux.txt2
-rw-r--r--src/build-data/os/irix.txt2
-rw-r--r--src/build-data/os/linux.txt2
-rw-r--r--src/build-data/os/mingw.txt1
-rw-r--r--src/build-data/os/netbsd.txt2
-rw-r--r--src/build-data/os/openbsd.txt2
-rw-r--r--src/build-data/os/qnx.txt2
-rw-r--r--src/build-data/os/solaris.txt2
-rw-r--r--src/build-data/os/tru64.txt2
-rw-r--r--src/build-data/os/windows.txt2
-rw-r--r--src/cert/cvc/info.txt2
-rw-r--r--src/cert/x509/info.txt2
-rw-r--r--src/checksum/adler32/info.txt2
-rw-r--r--src/checksum/crc24/info.txt2
-rw-r--r--src/checksum/crc32/info.txt2
-rw-r--r--src/cms/info.txt2
-rw-r--r--src/codec/base64/info.txt2
-rw-r--r--src/codec/bzip2/info.txt1
-rw-r--r--src/codec/hex/info.txt2
-rw-r--r--src/codec/openpgp/info.txt2
-rw-r--r--src/codec/pem/info.txt2
-rw-r--r--src/codec/zlib/info.txt1
-rw-r--r--src/cryptobox/info.txt2
-rw-r--r--src/engine/amd64_eng/info.txt2
-rw-r--r--src/engine/def_engine/info.txt2
-rw-r--r--src/engine/gnump/info.txt2
-rw-r--r--src/engine/ia32_eng/info.txt2
-rw-r--r--src/engine/info.txt2
-rw-r--r--src/engine/openssl/info.txt2
-rw-r--r--src/engine/sse2_eng/info.txt2
-rw-r--r--src/entropy/beos_stats/info.txt2
-rw-r--r--src/entropy/cryptoapi_rng/info.txt2
-rw-r--r--src/entropy/dev_random/info.txt2
-rw-r--r--src/entropy/egd/info.txt2
-rw-r--r--src/entropy/info.txt2
-rw-r--r--src/entropy/proc_walk/info.txt2
-rw-r--r--src/entropy/unix_procs/info.txt2
-rw-r--r--src/entropy/win32_stats/info.txt2
-rw-r--r--src/filters/fd_unix/info.txt2
-rw-r--r--src/filters/info.txt2
-rw-r--r--src/hash/bmw/info.txt2
-rw-r--r--src/hash/fork256/info.txt2
-rw-r--r--src/hash/gost_3411/info.txt2
-rw-r--r--src/hash/has160/info.txt2
-rw-r--r--src/hash/info.txt2
-rw-r--r--src/hash/md2/info.txt2
-rw-r--r--src/hash/md4/info.txt2
-rw-r--r--src/hash/md4_ia32/info.txt2
-rw-r--r--src/hash/md5/info.txt2
-rw-r--r--src/hash/md5_ia32/info.txt2
-rw-r--r--src/hash/mdx_hash/info.txt2
-rw-r--r--src/hash/par_hash/info.txt2
-rw-r--r--src/hash/rmd128/info.txt2
-rw-r--r--src/hash/rmd160/info.txt2
-rw-r--r--src/hash/sha1/info.txt2
-rw-r--r--src/hash/sha1_amd64/info.txt2
-rw-r--r--src/hash/sha1_ia32/info.txt2
-rw-r--r--src/hash/sha1_sse2/info.txt2
-rw-r--r--src/hash/sha2/info.txt2
-rw-r--r--src/hash/skein/info.txt2
-rw-r--r--src/hash/tiger/info.txt2
-rw-r--r--src/hash/whirlpool/info.txt2
-rw-r--r--src/kdf/info.txt2
-rw-r--r--src/kdf/kdf1/info.txt2
-rw-r--r--src/kdf/kdf2/info.txt2
-rw-r--r--src/kdf/mgf1/info.txt2
-rw-r--r--src/kdf/ssl_prf/info.txt2
-rw-r--r--src/kdf/tls_prf/info.txt2
-rw-r--r--src/kdf/x942_prf/info.txt2
-rw-r--r--src/libstate/info.txt2
-rw-r--r--src/libstate/oid_lookup/info.txt2
-rw-r--r--src/mac/cbc_mac/info.txt2
-rw-r--r--src/mac/cmac/info.txt2
-rw-r--r--src/mac/hmac/info.txt2
-rw-r--r--src/mac/info.txt2
-rw-r--r--src/mac/ssl3mac/info.txt2
-rw-r--r--src/mac/x919_mac/info.txt2
-rw-r--r--src/math/bigint/info.txt2
-rw-r--r--src/math/bigint/monty_amd64/info.txt2
-rw-r--r--src/math/bigint/monty_generic/info.txt2
-rw-r--r--src/math/bigint/mp_amd64/info.txt2
-rw-r--r--src/math/bigint/mp_asm64/info.txt2
-rw-r--r--src/math/bigint/mp_generic/info.txt2
-rw-r--r--src/math/bigint/mp_ia32/info.txt2
-rw-r--r--src/math/bigint/mp_ia32_msvc/info.txt2
-rw-r--r--src/math/bigint/mulop_amd64/info.txt2
-rw-r--r--src/math/bigint/mulop_generic/info.txt2
-rw-r--r--src/math/bigint/mulop_ia32/info.txt2
-rw-r--r--src/math/gfpmath/info.txt2
-rw-r--r--src/math/numbertheory/info.txt2
-rw-r--r--src/modes/cbc/info.txt2
-rw-r--r--src/modes/cfb/info.txt3
-rw-r--r--src/modes/cts/info.txt2
-rw-r--r--src/modes/eax/info.txt2
-rw-r--r--src/modes/ecb/info.txt2
-rw-r--r--src/modes/info.txt2
-rw-r--r--src/modes/mode_pad/info.txt2
-rw-r--r--src/modes/xts/info.txt2
-rw-r--r--src/mutex/info.txt2
-rw-r--r--src/mutex/noop_mutex/info.txt2
-rw-r--r--src/mutex/pthreads/info.txt2
-rw-r--r--src/mutex/qt_mutex/info.txt2
-rw-r--r--src/mutex/win32_crit_section/info.txt2
-rw-r--r--src/pbe/info.txt2
-rw-r--r--src/pbe/pbes1/info.txt2
-rw-r--r--src/pbe/pbes2/info.txt2
-rw-r--r--src/pk_pad/eme1/info.txt2
-rw-r--r--src/pk_pad/eme_pkcs/info.txt2
-rw-r--r--src/pk_pad/emsa1/info.txt2
-rw-r--r--src/pk_pad/emsa1_bsi/info.txt2
-rw-r--r--src/pk_pad/emsa2/info.txt2
-rw-r--r--src/pk_pad/emsa3/info.txt2
-rw-r--r--src/pk_pad/emsa4/info.txt2
-rw-r--r--src/pk_pad/emsa_raw/info.txt2
-rw-r--r--src/pk_pad/hash_id/info.txt2
-rw-r--r--src/pk_pad/info.txt2
-rw-r--r--src/pubkey/dh/info.txt2
-rw-r--r--src/pubkey/dl_algo/info.txt2
-rw-r--r--src/pubkey/dl_group/info.txt2
-rw-r--r--src/pubkey/dlies/info.txt2
-rw-r--r--src/pubkey/dsa/info.txt2
-rw-r--r--src/pubkey/ec_dompar/info.txt2
-rw-r--r--src/pubkey/ecc_key/info.txt2
-rw-r--r--src/pubkey/ecdsa/info.txt2
-rw-r--r--src/pubkey/eckaeg/info.txt2
-rw-r--r--src/pubkey/elgamal/info.txt2
-rw-r--r--src/pubkey/if_algo/info.txt2
-rw-r--r--src/pubkey/info.txt2
-rw-r--r--src/pubkey/keypair/info.txt2
-rw-r--r--src/pubkey/nr/info.txt2
-rw-r--r--src/pubkey/pk_codecs/info.txt2
-rw-r--r--src/pubkey/rsa/info.txt2
-rw-r--r--src/pubkey/rw/info.txt2
-rw-r--r--src/rng/auto_rng/info.txt2
-rw-r--r--src/rng/hmac_rng/info.txt2
-rw-r--r--src/rng/info.txt2
-rw-r--r--src/rng/randpool/info.txt2
-rw-r--r--src/rng/x931_rng/info.txt2
-rw-r--r--src/s2k/info.txt2
-rw-r--r--src/s2k/pbkdf1/info.txt2
-rw-r--r--src/s2k/pbkdf2/info.txt2
-rw-r--r--src/s2k/pgps2k/info.txt2
-rw-r--r--src/selftest/info.txt2
-rw-r--r--src/stream/arc4/info.txt2
-rw-r--r--src/stream/ctr/info.txt3
-rw-r--r--src/stream/info.txt2
-rw-r--r--src/stream/ofb/info.txt2
-rw-r--r--src/stream/salsa20/info.txt2
-rw-r--r--src/stream/turing/info.txt2
-rw-r--r--src/stream/wid_wake/info.txt2
-rw-r--r--src/sym_algo/info.txt2
-rw-r--r--src/timer/cpu_counter/info.txt2
-rw-r--r--src/timer/gettimeofday/info.txt3
-rw-r--r--src/timer/info.txt2
-rw-r--r--src/timer/posix_rt/info.txt3
-rw-r--r--src/timer/win32_query_perf_ctr/info.txt3
-rw-r--r--src/tss/info.txt2
-rw-r--r--src/utils/asm_amd64/info.txt2
-rw-r--r--src/utils/asm_ia32/info.txt2
-rw-r--r--src/utils/buf_comp/info.txt2
-rw-r--r--src/utils/datastor/info.txt2
-rw-r--r--src/utils/info.txt2
233 files changed, 0 insertions, 469 deletions
diff --git a/src/algo_factory/info.txt b/src/algo_factory/info.txt
index dfc42230a..4b25c7fc5 100644
--- a/src/algo_factory/info.txt
+++ b/src/algo_factory/info.txt
@@ -1,5 +1,3 @@
-realname "Algorithm Factory"
-
load_on auto
define ALGORITHM_FACTORY
diff --git a/src/alloc/alloc_mmap/info.txt b/src/alloc/alloc_mmap/info.txt
index 65d9b2977..e6bded3fb 100644
--- a/src/alloc/alloc_mmap/info.txt
+++ b/src/alloc/alloc_mmap/info.txt
@@ -1,5 +1,3 @@
-realname "Disk Based Allocation System"
-
define ALLOC_MMAP
modset unix
diff --git a/src/alloc/info.txt b/src/alloc/info.txt
index fa50aa09f..99dbe3a4d 100644
--- a/src/alloc/info.txt
+++ b/src/alloc/info.txt
@@ -1,5 +1,3 @@
-realname "Allocator"
-
load_on auto
<add>
diff --git a/src/alloc/mem_pool/info.txt b/src/alloc/mem_pool/info.txt
index 0a762ccc4..73a548292 100644
--- a/src/alloc/mem_pool/info.txt
+++ b/src/alloc/mem_pool/info.txt
@@ -1,5 +1,3 @@
-realname "Memory Pool Allocator"
-
load_on auto
<add>
diff --git a/src/alloc/system_alloc/info.txt b/src/alloc/system_alloc/info.txt
index 5fade38cf..8b9a2f067 100644
--- a/src/alloc/system_alloc/info.txt
+++ b/src/alloc/system_alloc/info.txt
@@ -1,5 +1,3 @@
-realname "Default (Malloc) Allocators"
-
load_on auto
<add>
diff --git a/src/aont/info.txt b/src/aont/info.txt
index a0387f358..533b70eb5 100644
--- a/src/aont/info.txt
+++ b/src/aont/info.txt
@@ -1,5 +1,3 @@
-realname "All or Nothing Transforms"
-
define PACKAGE_TRANSFORM
load_on auto
diff --git a/src/asn1/info.txt b/src/asn1/info.txt
index 7b8110c10..d836b4c0b 100644
--- a/src/asn1/info.txt
+++ b/src/asn1/info.txt
@@ -1,5 +1,3 @@
-realname "ASN.1/BER/DER module"
-
define ASN1
load_on auto
diff --git a/src/benchmark/info.txt b/src/benchmark/info.txt
index 0fbcdb2de..f148ae5ce 100644
--- a/src/benchmark/info.txt
+++ b/src/benchmark/info.txt
@@ -1,5 +1,3 @@
-realname "Benchmarking"
-
define RUNTIME_BENCHMARKING
load_on auto
diff --git a/src/block/aes/info.txt b/src/block/aes/info.txt
index 0e11603bb..480973100 100644
--- a/src/block/aes/info.txt
+++ b/src/block/aes/info.txt
@@ -1,3 +1 @@
-realname "AES"
-
define AES
diff --git a/src/block/blowfish/info.txt b/src/block/blowfish/info.txt
index c63560989..c935fb3ab 100644
--- a/src/block/blowfish/info.txt
+++ b/src/block/blowfish/info.txt
@@ -1,3 +1 @@
-realname "Blowfish"
-
define BLOWFISH
diff --git a/src/block/cast/info.txt b/src/block/cast/info.txt
index b9259042d..faba491c2 100644
--- a/src/block/cast/info.txt
+++ b/src/block/cast/info.txt
@@ -1,3 +1 @@
-realname "CAST"
-
define CAST
diff --git a/src/block/des/info.txt b/src/block/des/info.txt
index 6eec591a0..8e4f4e82d 100644
--- a/src/block/des/info.txt
+++ b/src/block/des/info.txt
@@ -1,3 +1 @@
-realname "DES"
-
define DES
diff --git a/src/block/gost_28147/info.txt b/src/block/gost_28147/info.txt
index 9b24d1e22..530f147e5 100644
--- a/src/block/gost_28147/info.txt
+++ b/src/block/gost_28147/info.txt
@@ -1,3 +1 @@
-realname "GOST 28147-89"
-
define GOST_28147_89
diff --git a/src/block/idea/info.txt b/src/block/idea/info.txt
index f11b3d224..a868d7cc7 100644
--- a/src/block/idea/info.txt
+++ b/src/block/idea/info.txt
@@ -1,3 +1 @@
-realname "IDEA"
-
define IDEA
diff --git a/src/block/info.txt b/src/block/info.txt
index f5840bf79..b4302a6d8 100644
--- a/src/block/info.txt
+++ b/src/block/info.txt
@@ -1,5 +1,3 @@
-realname "Block Ciphers"
-
define BLOCK_CIPHER
<requires>
diff --git a/src/block/kasumi/info.txt b/src/block/kasumi/info.txt
index e310488b3..cb8340fad 100644
--- a/src/block/kasumi/info.txt
+++ b/src/block/kasumi/info.txt
@@ -1,3 +1 @@
-realname "Kasumi"
-
define KASUMI
diff --git a/src/block/lion/info.txt b/src/block/lion/info.txt
index 64f2989b1..9562be1d0 100644
--- a/src/block/lion/info.txt
+++ b/src/block/lion/info.txt
@@ -1,5 +1,3 @@
-realname "Lion"
-
define LION
<requires>
diff --git a/src/block/lubyrack/info.txt b/src/block/lubyrack/info.txt
index d915781d8..41c395097 100644
--- a/src/block/lubyrack/info.txt
+++ b/src/block/lubyrack/info.txt
@@ -1,5 +1,3 @@
-realname "Luby-Rackoff"
-
define LUBY_RACKOFF
<requires>
diff --git a/src/block/mars/info.txt b/src/block/mars/info.txt
index ec958eaf5..afdcebe67 100644
--- a/src/block/mars/info.txt
+++ b/src/block/mars/info.txt
@@ -1,3 +1 @@
-realname "MARS"
-
define MARS
diff --git a/src/block/misty1/info.txt b/src/block/misty1/info.txt
index 38087c83d..290b8b1d7 100644
--- a/src/block/misty1/info.txt
+++ b/src/block/misty1/info.txt
@@ -1,3 +1 @@
-realname "MISTY-1"
-
define MISTY1
diff --git a/src/block/noekeon/info.txt b/src/block/noekeon/info.txt
index 6e940bb62..31f7e7de3 100644
--- a/src/block/noekeon/info.txt
+++ b/src/block/noekeon/info.txt
@@ -1,3 +1 @@
-realname "Noekeon"
-
define NOEKEON
diff --git a/src/block/rc2/info.txt b/src/block/rc2/info.txt
index 7ec018422..7eee38d6b 100644
--- a/src/block/rc2/info.txt
+++ b/src/block/rc2/info.txt
@@ -1,3 +1 @@
-realname "RC2"
-
define RC2
diff --git a/src/block/rc5/info.txt b/src/block/rc5/info.txt
index 2032b406f..3da32710d 100644
--- a/src/block/rc5/info.txt
+++ b/src/block/rc5/info.txt
@@ -1,3 +1 @@
-realname "RC5"
-
define RC5
diff --git a/src/block/rc6/info.txt b/src/block/rc6/info.txt
index 2897bc1f3..fc7d2acb4 100644
--- a/src/block/rc6/info.txt
+++ b/src/block/rc6/info.txt
@@ -1,3 +1 @@
-realname "RC6"
-
define RC6
diff --git a/src/block/safer/info.txt b/src/block/safer/info.txt
index 7c8067472..0ca49602d 100644
--- a/src/block/safer/info.txt
+++ b/src/block/safer/info.txt
@@ -1,3 +1 @@
-realname "SAFER"
-
define SAFER
diff --git a/src/block/seed/info.txt b/src/block/seed/info.txt
index c66e0c2cd..96f4b75f2 100644
--- a/src/block/seed/info.txt
+++ b/src/block/seed/info.txt
@@ -1,3 +1 @@
-realname "SEED"
-
define SEED
diff --git a/src/block/serpent/info.txt b/src/block/serpent/info.txt
index 4031a3f5f..5fcc14f74 100644
--- a/src/block/serpent/info.txt
+++ b/src/block/serpent/info.txt
@@ -1,3 +1 @@
-realname "Serpent"
-
define SERPENT
diff --git a/src/block/serpent_ia32/info.txt b/src/block/serpent_ia32/info.txt
index 48d589724..fa6d9b9d9 100644
--- a/src/block/serpent_ia32/info.txt
+++ b/src/block/serpent_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "Serpent (IA-32)"
-
define SERPENT_IA32
load_on asm_ok
diff --git a/src/block/serpent_sse2/info.txt b/src/block/serpent_sse2/info.txt
index da7eef6bc..a4ec561a8 100644
--- a/src/block/serpent_sse2/info.txt
+++ b/src/block/serpent_sse2/info.txt
@@ -1,5 +1,3 @@
-realname "Serpent (SSE2)"
-
define SERPENT_SSE2
<requires>
diff --git a/src/block/skipjack/info.txt b/src/block/skipjack/info.txt
index 9cdddfe6b..7dfffda4e 100644
--- a/src/block/skipjack/info.txt
+++ b/src/block/skipjack/info.txt
@@ -1,3 +1 @@
-realname "Skipjack"
-
define SKIPJACK
diff --git a/src/block/square/info.txt b/src/block/square/info.txt
index 7c517be71..d33379815 100644
--- a/src/block/square/info.txt
+++ b/src/block/square/info.txt
@@ -1,3 +1 @@
-realname "Square"
-
define SQUARE
diff --git a/src/block/tea/info.txt b/src/block/tea/info.txt
index 85a19ee4c..67ed5a656 100644
--- a/src/block/tea/info.txt
+++ b/src/block/tea/info.txt
@@ -1,3 +1 @@
-realname "TEA"
-
define TEA
diff --git a/src/block/twofish/info.txt b/src/block/twofish/info.txt
index 319da6e6e..88eae9ce7 100644
--- a/src/block/twofish/info.txt
+++ b/src/block/twofish/info.txt
@@ -1,3 +1 @@
-realname "Twofish"
-
define TWOFISH
diff --git a/src/block/xtea/info.txt b/src/block/xtea/info.txt
index 1887e6673..d9d37607c 100644
--- a/src/block/xtea/info.txt
+++ b/src/block/xtea/info.txt
@@ -1,3 +1 @@
-realname "XTEA"
-
define XTEA
diff --git a/src/build-data/arch/alpha.txt b/src/build-data/arch/alpha.txt
index 60b264396..b1d939ed1 100644
--- a/src/build-data/arch/alpha.txt
+++ b/src/build-data/arch/alpha.txt
@@ -1,5 +1,3 @@
-realname "DEC Alpha"
-
default_submodel alpha-ev4
endian little
diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt
index 216588e7b..96da0e3a9 100644
--- a/src/build-data/arch/amd64.txt
+++ b/src/build-data/arch/amd64.txt
@@ -1,5 +1,3 @@
-realname "x86-64"
-
default_submodel opteron
endian little
diff --git a/src/build-data/arch/arm.txt b/src/build-data/arch/arm.txt
index c6be4ad46..5f05d4cad 100644
--- a/src/build-data/arch/arm.txt
+++ b/src/build-data/arch/arm.txt
@@ -1,5 +1,3 @@
-realname "ARM"
-
default_submodel arm2
<submodels>
diff --git a/src/build-data/arch/hitachi-sh.txt b/src/build-data/arch/hitachi-sh.txt
index 8e9f7eee3..85a741f59 100644
--- a/src/build-data/arch/hitachi-sh.txt
+++ b/src/build-data/arch/hitachi-sh.txt
@@ -1,5 +1,3 @@
-realname "Hitachi SH"
-
default_submodel hitachi-sh1
<submodels>
diff --git a/src/build-data/arch/hppa.txt b/src/build-data/arch/hppa.txt
index 4cdd40889..67bca263d 100644
--- a/src/build-data/arch/hppa.txt
+++ b/src/build-data/arch/hppa.txt
@@ -1,5 +1,3 @@
-realname "HP-PA"
-
default_submodel hppa1.0
<aliases>
diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/ia32.txt
index aafcf9a77..0fe665e68 100644
--- a/src/build-data/arch/ia32.txt
+++ b/src/build-data/arch/ia32.txt
@@ -1,5 +1,3 @@
-realname "IA-32"
-
default_submodel i386
endian little
diff --git a/src/build-data/arch/ia64.txt b/src/build-data/arch/ia64.txt
index 7ca84c007..65309f0ff 100644
--- a/src/build-data/arch/ia64.txt
+++ b/src/build-data/arch/ia64.txt
@@ -1,5 +1,3 @@
-realname "IA-64"
-
# This is safe: only affects tuning, not ISA
default_submodel itanium2
diff --git a/src/build-data/arch/m68k.txt b/src/build-data/arch/m68k.txt
index 759a3dac1..3a8b5e8b3 100644
--- a/src/build-data/arch/m68k.txt
+++ b/src/build-data/arch/m68k.txt
@@ -1,5 +1,3 @@
-realname "Motorola 680x0"
-
default_submodel 68020
endian big
diff --git a/src/build-data/arch/mips32.txt b/src/build-data/arch/mips32.txt
index 9846c8fb2..ec9d4b5bf 100644
--- a/src/build-data/arch/mips32.txt
+++ b/src/build-data/arch/mips32.txt
@@ -1,5 +1,3 @@
-realname "MIPS"
-
default_submodel r3000
<aliases>
diff --git a/src/build-data/arch/mips64.txt b/src/build-data/arch/mips64.txt
index dbb49d028..666ba7e18 100644
--- a/src/build-data/arch/mips64.txt
+++ b/src/build-data/arch/mips64.txt
@@ -1,5 +1,3 @@
-realname "MIPS64"
-
default_submodel r4400
<submodels>
diff --git a/src/build-data/arch/ppc.txt b/src/build-data/arch/ppc.txt
index e2dfa6ea2..254643fdd 100644
--- a/src/build-data/arch/ppc.txt
+++ b/src/build-data/arch/ppc.txt
@@ -1,5 +1,3 @@
-realname "PowerPC"
-
endian big
unaligned ok
diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt
index 7c8944faf..f044ba98d 100644
--- a/src/build-data/arch/ppc64.txt
+++ b/src/build-data/arch/ppc64.txt
@@ -1,5 +1,3 @@
-realname "PowerPC 64"
-
endian big
default_submodel power4
diff --git a/src/build-data/arch/s390.txt b/src/build-data/arch/s390.txt
index 312b262c4..8024a4315 100644
--- a/src/build-data/arch/s390.txt
+++ b/src/build-data/arch/s390.txt
@@ -1,5 +1,3 @@
-realname "S/390 31-bit"
-
default_submodel s390
endian big
diff --git a/src/build-data/arch/s390x.txt b/src/build-data/arch/s390x.txt
index 9fe6bd615..00daab8b4 100644
--- a/src/build-data/arch/s390x.txt
+++ b/src/build-data/arch/s390x.txt
@@ -1,5 +1,3 @@
-realname "S/390 64-bit"
-
default_submodel s390x
endian big
diff --git a/src/build-data/arch/sparc32.txt b/src/build-data/arch/sparc32.txt
index 6b752df87..57b19c519 100644
--- a/src/build-data/arch/sparc32.txt
+++ b/src/build-data/arch/sparc32.txt
@@ -1,5 +1,3 @@
-realname "SPARC"
-
# V7 doesn't have integer multiply, so it will be bitterly slow for some things
# (especially BigInt). Also, it's fairly rare nowadays, so we default to V8.
default_submodel sparc32-v8
@@ -31,4 +29,3 @@ sparc-v7 -> sparc32-v7
sparc-v8 -> sparc32-v8
sparc-v9 -> sparc32-v9
</submodel_aliases>
-
diff --git a/src/build-data/arch/sparc64.txt b/src/build-data/arch/sparc64.txt
index c0575efc4..e308055fa 100644
--- a/src/build-data/arch/sparc64.txt
+++ b/src/build-data/arch/sparc64.txt
@@ -1,5 +1,3 @@
-realname "SPARC64"
-
default_submodel sparc64-ultra
<submodels>
diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index fe88c270e..4315c379f 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -1,5 +1,3 @@
-realname "Borland C++"
-
macro_name "BORLAND"
binary_name "bcc32"
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 480794faf..18f3580ce 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -1,5 +1,3 @@
-realname "Clang/LLVM"
-
# Largely copied from the gcc config
macro_name "CLANG"
diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt
index 94075e888..9ad6514ab 100644
--- a/src/build-data/cc/compaq.txt
+++ b/src/build-data/cc/compaq.txt
@@ -1,5 +1,3 @@
-realname "Compaq C++"
-
macro_name "COMPAQ"
binary_name "cxx"
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index 38516e2f3..ecd813629 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -1,5 +1,3 @@
-realname "PathScale EKOPath C++"
-
macro_name "PATHSCALE"
binary_name "pathCC"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 9adef8cfb..370bb84d7 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,5 +1,3 @@
-realname "GNU C++"
-
macro_name "GCC"
binary_name "g++"
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 9c0d4a784..5bde87de9 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -1,5 +1,3 @@
-realname "HP-UX C++"
-
macro_name "HP_ACC"
binary_name "aCC"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index 9595714f6..628a59e2d 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -1,5 +1,3 @@
-realname "Intel C++"
-
macro_name "INTEL"
binary_name "icpc"
diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt
index 52ddba4ab..d0ff1c28a 100644
--- a/src/build-data/cc/kai.txt
+++ b/src/build-data/cc/kai.txt
@@ -1,5 +1,3 @@
-realname "KAI C++"
-
macro_name "KAI"
binary_name "KCC"
diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt
index a4cfbd1ee..c518f4c26 100644
--- a/src/build-data/cc/mipspro.txt
+++ b/src/build-data/cc/mipspro.txt
@@ -1,5 +1,3 @@
-realname "SGI MIPSPro C++"
-
macro_name "MIPSPRO"
binary_name "CC"
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index c19d93e2b..603ea449b 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -1,5 +1,3 @@
-realname "Visual C++"
-
macro_name "MSVC"
binary_name "cl.exe"
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 0157440cf..e794c755e 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -1,5 +1,3 @@
-realname "Open64"
-
macro_name "OPEN64"
binary_name "openCC"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index c4fdb9e70..a6d2416ab 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -1,5 +1,3 @@
-realname "Portland Group C++"
-
macro_name "PORTLAND_GROUP"
binary_name "pgCC"
diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt
index be91ac69a..073f2fec0 100644
--- a/src/build-data/cc/sgipro64.txt
+++ b/src/build-data/cc/sgipro64.txt
@@ -1,5 +1,3 @@
-realname "SGI Pro64"
-
macro_name "SGI_PRO64"
binary_name "sgiCC"
diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt
index 9756f8538..7065d4129 100644
--- a/src/build-data/cc/sunwspro.txt
+++ b/src/build-data/cc/sunwspro.txt
@@ -1,5 +1,3 @@
-realname "Sun Workshop Pro C++"
-
macro_name "SUN_WORKSHOP"
binary_name "CC"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 6d06b4c43..521624395 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -1,5 +1,3 @@
-realname "IBM XL C/C++"
-
macro_name "IBM_XLC"
binary_name "xlC"
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index cec818580..0063948c7 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -1,5 +1,3 @@
-realname "AIX"
-
os_type unix
<supports_shared>
diff --git a/src/build-data/os/beos.txt b/src/build-data/os/beos.txt
index 2b12792bb..b843bd525 100644
--- a/src/build-data/os/beos.txt
+++ b/src/build-data/os/beos.txt
@@ -1,5 +1,3 @@
-realname "BeOS"
-
os_type beos
install_root /boot/beos
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index c2aadea98..7290648c2 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -1,5 +1,3 @@
-realname "Cygwin"
-
os_type unix
install_root c:\Botan
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index 298621216..fb18ee191 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -1,5 +1,3 @@
-realname "Darwin / MacOS X"
-
os_type unix
so_suffix dylib
diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt
index 7e3663435..6823de5b6 100644
--- a/src/build-data/os/dragonfly.txt
+++ b/src/build-data/os/dragonfly.txt
@@ -1,5 +1,3 @@
-realname "DragonFly"
-
os_type unix
<target_features>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index ea96b0c88..6823de5b6 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -1,5 +1,3 @@
-realname "FreeBSD"
-
os_type unix
<target_features>
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index 6e17d3b73..9ff0f7f62 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -1,5 +1,3 @@
-realname "HP-UX"
-
os_type unix
so_suffix sl
diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt
index fd8b43287..0063948c7 100644
--- a/src/build-data/os/irix.txt
+++ b/src/build-data/os/irix.txt
@@ -1,5 +1,3 @@
-realname "IRIX"
-
os_type unix
<supports_shared>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 53528511a..3a92f9dd7 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -1,5 +1,3 @@
-realname "Linux"
-
os_type unix
<target_features>
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index eb25017fc..2b7a16cf7 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -1,4 +1,3 @@
-realname "MS Windows (MinGW)"
os_type windows
obj_suffix o
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 435d8f5e8..0063948c7 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -1,5 +1,3 @@
-realname "NetBSD"
-
os_type unix
<supports_shared>
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index cb44bd115..0063948c7 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -1,5 +1,3 @@
-realname "OpenBSD"
-
os_type unix
<supports_shared>
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 28bc8dea9..0063948c7 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -1,5 +1,3 @@
-realname "QNX"
-
os_type unix
<supports_shared>
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 8610b4898..47b06dcc4 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -1,5 +1,3 @@
-realname "Solaris"
-
os_type unix
<target_features>
diff --git a/src/build-data/os/tru64.txt b/src/build-data/os/tru64.txt
index e320c1df4..8fc301d79 100644
--- a/src/build-data/os/tru64.txt
+++ b/src/build-data/os/tru64.txt
@@ -1,5 +1,3 @@
-realname "Tru64"
-
os_type unix
<supports_shared>
diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt
index a04d609b8..e2e8bb665 100644
--- a/src/build-data/os/windows.txt
+++ b/src/build-data/os/windows.txt
@@ -1,5 +1,3 @@
-realname "MS Windows"
-
os_type windows
obj_suffix obj
diff --git a/src/cert/cvc/info.txt b/src/cert/cvc/info.txt
index e3e11f5fe..bdd496614 100644
--- a/src/cert/cvc/info.txt
+++ b/src/cert/cvc/info.txt
@@ -1,5 +1,3 @@
-realname "Card Verifiable Certificates"
-
define CARD_VERIFIABLE_CERTIFICATES
uses_tr1 yes
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
index 552e2aacb..37faea9fa 100644
--- a/src/cert/x509/info.txt
+++ b/src/cert/x509/info.txt
@@ -1,5 +1,3 @@
-realname "X.509"
-
define X509
load_on auto
diff --git a/src/checksum/adler32/info.txt b/src/checksum/adler32/info.txt
index 76662cdec..53bc66354 100644
--- a/src/checksum/adler32/info.txt
+++ b/src/checksum/adler32/info.txt
@@ -1,5 +1,3 @@
-realname "Adler32"
-
define ADLER32
load_on auto
diff --git a/src/checksum/crc24/info.txt b/src/checksum/crc24/info.txt
index 33b86a9da..8c61aa58b 100644
--- a/src/checksum/crc24/info.txt
+++ b/src/checksum/crc24/info.txt
@@ -1,5 +1,3 @@
-realname "CRC-24"
-
define CRC24
load_on auto
diff --git a/src/checksum/crc32/info.txt b/src/checksum/crc32/info.txt
index 15933b375..d86848cf4 100644
--- a/src/checksum/crc32/info.txt
+++ b/src/checksum/crc32/info.txt
@@ -1,5 +1,3 @@
-realname "CRC-32"
-
define CRC32
load_on auto
diff --git a/src/cms/info.txt b/src/cms/info.txt
index 82c31b564..55d559f83 100644
--- a/src/cms/info.txt
+++ b/src/cms/info.txt
@@ -1,5 +1,3 @@
-realname "CMS"
-
define CMS
load_on auto
diff --git a/src/codec/base64/info.txt b/src/codec/base64/info.txt
index d4ed80976..1d36b948e 100644
--- a/src/codec/base64/info.txt
+++ b/src/codec/base64/info.txt
@@ -1,5 +1,3 @@
-realname "Base64 Codec"
-
define BASE64_CODEC
load_on auto
diff --git a/src/codec/bzip2/info.txt b/src/codec/bzip2/info.txt
index 1be84e405..7fd426f90 100644
--- a/src/codec/bzip2/info.txt
+++ b/src/codec/bzip2/info.txt
@@ -1,6 +1,5 @@
# This module was written by Peter J. Jones
-realname "Bzip2 Compressor"
define COMPRESSOR_BZIP2
modset compression
diff --git a/src/codec/hex/info.txt b/src/codec/hex/info.txt
index 512a5de8b..817ff1a00 100644
--- a/src/codec/hex/info.txt
+++ b/src/codec/hex/info.txt
@@ -1,5 +1,3 @@
-realname "Hex Codec"
-
define HEX_CODEC
load_on auto
diff --git a/src/codec/openpgp/info.txt b/src/codec/openpgp/info.txt
index 6b30850d0..f7774b147 100644
--- a/src/codec/openpgp/info.txt
+++ b/src/codec/openpgp/info.txt
@@ -1,5 +1,3 @@
-realname "OpenPGP Codec"
-
define OPENPGP_CODEC
load_on auto
diff --git a/src/codec/pem/info.txt b/src/codec/pem/info.txt
index bbe8d4c70..5544e1bb0 100644
--- a/src/codec/pem/info.txt
+++ b/src/codec/pem/info.txt
@@ -1,5 +1,3 @@
-realname "PEM Codec"
-
define PEM_CODEC
load_on auto
diff --git a/src/codec/zlib/info.txt b/src/codec/zlib/info.txt
index 9b1c35d84..267c3be92 100644
--- a/src/codec/zlib/info.txt
+++ b/src/codec/zlib/info.txt
@@ -1,4 +1,3 @@
-realname "Zlib Compressor"
#realname "Zlib/Gzip Compressor"
define COMPRESSOR_ZLIB
diff --git a/src/cryptobox/info.txt b/src/cryptobox/info.txt
index b9b98060f..0780f55aa 100644
--- a/src/cryptobox/info.txt
+++ b/src/cryptobox/info.txt
@@ -1,5 +1,3 @@
-realname "Crypto Box"
-
load_on auto
define CRYPTO_BOX
diff --git a/src/engine/amd64_eng/info.txt b/src/engine/amd64_eng/info.txt
index 47f891445..03baf76ee 100644
--- a/src/engine/amd64_eng/info.txt
+++ b/src/engine/amd64_eng/info.txt
@@ -1,5 +1,3 @@
-realname "AMD64 Assembler Engine"
-
define ENGINE_AMD64_ASSEMBLER
load_on dep
diff --git a/src/engine/def_engine/info.txt b/src/engine/def_engine/info.txt
index fd31ee2d0..e307fbf8e 100644
--- a/src/engine/def_engine/info.txt
+++ b/src/engine/def_engine/info.txt
@@ -1,5 +1,3 @@
-realname "Default Engine"
-
define DEFAULT_ENGINE
load_on auto
diff --git a/src/engine/gnump/info.txt b/src/engine/gnump/info.txt
index 67a9bcd70..0805c1ba8 100644
--- a/src/engine/gnump/info.txt
+++ b/src/engine/gnump/info.txt
@@ -1,5 +1,3 @@
-realname "GMP Engine"
-
define ENGINE_GNU_MP
load_on request
diff --git a/src/engine/ia32_eng/info.txt b/src/engine/ia32_eng/info.txt
index 3bf2a7f2b..98fd1f2cc 100644
--- a/src/engine/ia32_eng/info.txt
+++ b/src/engine/ia32_eng/info.txt
@@ -1,5 +1,3 @@
-realname "IA32 Assembler Engine"
-
define ENGINE_IA32_ASSEMBLER
load_on dep
diff --git a/src/engine/info.txt b/src/engine/info.txt
index eef3c03b6..dcb26d9d6 100644
--- a/src/engine/info.txt
+++ b/src/engine/info.txt
@@ -1,5 +1,3 @@
-realname "Engines"
-
define ENGINES
load_on auto
diff --git a/src/engine/openssl/info.txt b/src/engine/openssl/info.txt
index 3f2f1ab14..9f8c84b31 100644
--- a/src/engine/openssl/info.txt
+++ b/src/engine/openssl/info.txt
@@ -1,5 +1,3 @@
-realname "OpenSSL Engine"
-
define ENGINE_OPENSSL
load_on request
diff --git a/src/engine/sse2_eng/info.txt b/src/engine/sse2_eng/info.txt
index 7508b9874..43df92343 100644
--- a/src/engine/sse2_eng/info.txt
+++ b/src/engine/sse2_eng/info.txt
@@ -1,5 +1,3 @@
-realname "SSE2 Assembler Engine"
-
define ENGINE_SSE2_ASSEMBLER
load_on dep
diff --git a/src/entropy/beos_stats/info.txt b/src/entropy/beos_stats/info.txt
index a7e62cfb3..84ecf601d 100644
--- a/src/entropy/beos_stats/info.txt
+++ b/src/entropy/beos_stats/info.txt
@@ -1,5 +1,3 @@
-realname "BeOS Entropy Source"
-
define ENTROPY_SRC_BEOS
modset beos
diff --git a/src/entropy/cryptoapi_rng/info.txt b/src/entropy/cryptoapi_rng/info.txt
index 643c67d2e..d7a5dbca0 100644
--- a/src/entropy/cryptoapi_rng/info.txt
+++ b/src/entropy/cryptoapi_rng/info.txt
@@ -1,5 +1,3 @@
-realname "Win32 CryptoAPI Entropy Source"
-
define ENTROPY_SRC_CAPI
load_on auto
modset win32
diff --git a/src/entropy/dev_random/info.txt b/src/entropy/dev_random/info.txt
index 5231b2901..376f3b4ba 100644
--- a/src/entropy/dev_random/info.txt
+++ b/src/entropy/dev_random/info.txt
@@ -1,5 +1,3 @@
-realname "RNG Device Reader"
-
define ENTROPY_SRC_DEVICE
load_on auto
diff --git a/src/entropy/egd/info.txt b/src/entropy/egd/info.txt
index 85ba86c00..77e7197dc 100644
--- a/src/entropy/egd/info.txt
+++ b/src/entropy/egd/info.txt
@@ -1,5 +1,3 @@
-realname "EGD Entropy Source"
-
define ENTROPY_SRC_EGD
load_on auto
diff --git a/src/entropy/info.txt b/src/entropy/info.txt
index ec3be5f58..5f3d39dd5 100644
--- a/src/entropy/info.txt
+++ b/src/entropy/info.txt
@@ -1,5 +1,3 @@
-realname "Entropy Sources"
-
load_on auto
<add>
diff --git a/src/entropy/proc_walk/info.txt b/src/entropy/proc_walk/info.txt
index b82929a73..f6302df1a 100644
--- a/src/entropy/proc_walk/info.txt
+++ b/src/entropy/proc_walk/info.txt
@@ -1,5 +1,3 @@
-realname "File Tree Walking Entropy Source"
-
define ENTROPY_SRC_FTW
load_on auto
diff --git a/src/entropy/unix_procs/info.txt b/src/entropy/unix_procs/info.txt
index 928ec13b3..de88cc1b8 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/src/entropy/unix_procs/info.txt
@@ -1,5 +1,3 @@
-realname "Generic Unix Entropy Source"
-
define ENTROPY_SRC_UNIX
modset unix,beos
diff --git a/src/entropy/win32_stats/info.txt b/src/entropy/win32_stats/info.txt
index ca7100923..da8ea72ff 100644
--- a/src/entropy/win32_stats/info.txt
+++ b/src/entropy/win32_stats/info.txt
@@ -1,5 +1,3 @@
-realname "Win32 Entropy Source"
-
# Probably not much of an issue anymore
#note "This module will not run under NT4"
diff --git a/src/filters/fd_unix/info.txt b/src/filters/fd_unix/info.txt
index d87978cb0..bdd9b957f 100644
--- a/src/filters/fd_unix/info.txt
+++ b/src/filters/fd_unix/info.txt
@@ -1,5 +1,3 @@
-realname "Unix I/O support for Pipe"
-
define PIPE_UNIXFD_IO
modset unix,beos
diff --git a/src/filters/info.txt b/src/filters/info.txt
index fb8108659..a76b6b4fe 100644
--- a/src/filters/info.txt
+++ b/src/filters/info.txt
@@ -1,5 +1,3 @@
-realname "Pipe/Filter"
-
load_on auto
define FILTERS
diff --git a/src/hash/bmw/info.txt b/src/hash/bmw/info.txt
index 27e069c0a..7170223d7 100644
--- a/src/hash/bmw/info.txt
+++ b/src/hash/bmw/info.txt
@@ -1,5 +1,3 @@
-realname "Blue Midnight Wish"
-
define BMW_512
<requires>
diff --git a/src/hash/fork256/info.txt b/src/hash/fork256/info.txt
index 7c3c5bb94..c2f8c47f2 100644
--- a/src/hash/fork256/info.txt
+++ b/src/hash/fork256/info.txt
@@ -1,5 +1,3 @@
-realname "FORK-256"
-
define FORK_256
<requires>
diff --git a/src/hash/gost_3411/info.txt b/src/hash/gost_3411/info.txt
index 353ceb3e5..c4cb4e1a5 100644
--- a/src/hash/gost_3411/info.txt
+++ b/src/hash/gost_3411/info.txt
@@ -1,5 +1,3 @@
-realname "GOST 34.11"
-
define GOST_34_11
<requires>
diff --git a/src/hash/has160/info.txt b/src/hash/has160/info.txt
index 98cbc5155..f862bdb20 100644
--- a/src/hash/has160/info.txt
+++ b/src/hash/has160/info.txt
@@ -1,5 +1,3 @@
-realname "HAS-160"
-
define HAS_160
<requires>
diff --git a/src/hash/info.txt b/src/hash/info.txt
index ce55f7ddc..0e45806f8 100644
--- a/src/hash/info.txt
+++ b/src/hash/info.txt
@@ -1,5 +1,3 @@
-realname "Hash Functions"
-
load_on auto
<add>
diff --git a/src/hash/md2/info.txt b/src/hash/md2/info.txt
index 4428584fd..2359c5df7 100644
--- a/src/hash/md2/info.txt
+++ b/src/hash/md2/info.txt
@@ -1,3 +1 @@
-realname "MD2"
-
define MD2
diff --git a/src/hash/md4/info.txt b/src/hash/md4/info.txt
index 6aa4a5d59..2b276e168 100644
--- a/src/hash/md4/info.txt
+++ b/src/hash/md4/info.txt
@@ -1,5 +1,3 @@
-realname "MD4"
-
define MD4
<requires>
diff --git a/src/hash/md4_ia32/info.txt b/src/hash/md4_ia32/info.txt
index 217c3fc21..732285c56 100644
--- a/src/hash/md4_ia32/info.txt
+++ b/src/hash/md4_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "MD4 (IA-32)"
-
define MD4_IA32
load_on asm_ok
diff --git a/src/hash/md5/info.txt b/src/hash/md5/info.txt
index 14861d635..a4ad1462c 100644
--- a/src/hash/md5/info.txt
+++ b/src/hash/md5/info.txt
@@ -1,5 +1,3 @@
-realname "MD5"
-
define MD5
<requires>
diff --git a/src/hash/md5_ia32/info.txt b/src/hash/md5_ia32/info.txt
index d298f2005..48a8b4a10 100644
--- a/src/hash/md5_ia32/info.txt
+++ b/src/hash/md5_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "MD5 (IA-32)"
-
define MD5_IA32
load_on asm_ok
diff --git a/src/hash/mdx_hash/info.txt b/src/hash/mdx_hash/info.txt
index ee4ccd6da..0c30a1a54 100644
--- a/src/hash/mdx_hash/info.txt
+++ b/src/hash/mdx_hash/info.txt
@@ -1,5 +1,3 @@
-realname "MDx Hash Base"
-
define MDX_HASH_FUNCTION
load_on dep
diff --git a/src/hash/par_hash/info.txt b/src/hash/par_hash/info.txt
index 029939cb5..d641a9cee 100644
--- a/src/hash/par_hash/info.txt
+++ b/src/hash/par_hash/info.txt
@@ -1,3 +1 @@
-realname "Parallel Hash"
-
define PARALLEL_HASH
diff --git a/src/hash/rmd128/info.txt b/src/hash/rmd128/info.txt
index 0a1ef2c74..11e4181f4 100644
--- a/src/hash/rmd128/info.txt
+++ b/src/hash/rmd128/info.txt
@@ -1,5 +1,3 @@
-realname "RIPEMD-128"
-
define RIPEMD_128
<requires>
diff --git a/src/hash/rmd160/info.txt b/src/hash/rmd160/info.txt
index 225106afc..28be6854d 100644
--- a/src/hash/rmd160/info.txt
+++ b/src/hash/rmd160/info.txt
@@ -1,5 +1,3 @@
-realname "RIPEMD-160"
-
define RIPEMD_160
<requires>
diff --git a/src/hash/sha1/info.txt b/src/hash/sha1/info.txt
index 8915f9ebd..56403db21 100644
--- a/src/hash/sha1/info.txt
+++ b/src/hash/sha1/info.txt
@@ -1,5 +1,3 @@
-realname "SHA-1"
-
define SHA1
<requires>
diff --git a/src/hash/sha1_amd64/info.txt b/src/hash/sha1_amd64/info.txt
index 183658ac7..e54b032ca 100644
--- a/src/hash/sha1_amd64/info.txt
+++ b/src/hash/sha1_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "SHA-1 (x86-64 assembler)"
-
define SHA1_AMD64
load_on asm_ok
diff --git a/src/hash/sha1_ia32/info.txt b/src/hash/sha1_ia32/info.txt
index e7709454f..0361395fe 100644
--- a/src/hash/sha1_ia32/info.txt
+++ b/src/hash/sha1_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "SHA-1 (IA-32)"
-
define SHA1_IA32
load_on asm_ok
diff --git a/src/hash/sha1_sse2/info.txt b/src/hash/sha1_sse2/info.txt
index 4a7a1b5e9..ad61aa5fa 100644
--- a/src/hash/sha1_sse2/info.txt
+++ b/src/hash/sha1_sse2/info.txt
@@ -1,5 +1,3 @@
-realname "SHA-1 (SSE2)"
-
define SHA1_SSE2
<requires>
diff --git a/src/hash/sha2/info.txt b/src/hash/sha2/info.txt
index 8cc50fa41..e12f2b694 100644
--- a/src/hash/sha2/info.txt
+++ b/src/hash/sha2/info.txt
@@ -1,5 +1,3 @@
-realname "SHA-2 (224, 256, 384, 512)"
-
define SHA2
<requires>
diff --git a/src/hash/skein/info.txt b/src/hash/skein/info.txt
index 908033852..427f59121 100644
--- a/src/hash/skein/info.txt
+++ b/src/hash/skein/info.txt
@@ -1,5 +1,3 @@
-realname "Skein"
-
define SKEIN_512
<requires>
diff --git a/src/hash/tiger/info.txt b/src/hash/tiger/info.txt
index 92b5519c0..b50b745e3 100644
--- a/src/hash/tiger/info.txt
+++ b/src/hash/tiger/info.txt
@@ -1,5 +1,3 @@
-realname "Tiger"
-
define TIGER
<requires>
diff --git a/src/hash/whirlpool/info.txt b/src/hash/whirlpool/info.txt
index 4fe4b2b25..7bec0c6cf 100644
--- a/src/hash/whirlpool/info.txt
+++ b/src/hash/whirlpool/info.txt
@@ -1,5 +1,3 @@
-realname "Whirlpool"
-
define WHIRLPOOL
<requires>
diff --git a/src/kdf/info.txt b/src/kdf/info.txt
index 1965a2098..8eb4fc6e9 100644
--- a/src/kdf/info.txt
+++ b/src/kdf/info.txt
@@ -1,5 +1,3 @@
-realname "KDF Base Class"
-
define KDF_BASE
load_on auto
diff --git a/src/kdf/kdf1/info.txt b/src/kdf/kdf1/info.txt
index ede10017e..2557f9472 100644
--- a/src/kdf/kdf1/info.txt
+++ b/src/kdf/kdf1/info.txt
@@ -1,5 +1,3 @@
-realname "KDF1"
-
define KDF1
load_on auto
diff --git a/src/kdf/kdf2/info.txt b/src/kdf/kdf2/info.txt
index 1858f8929..b71595449 100644
--- a/src/kdf/kdf2/info.txt
+++ b/src/kdf/kdf2/info.txt
@@ -1,5 +1,3 @@
-realname "KDF2"
-
define KDF2
load_on auto
diff --git a/src/kdf/mgf1/info.txt b/src/kdf/mgf1/info.txt
index f9e952f82..0f104c3b3 100644
--- a/src/kdf/mgf1/info.txt
+++ b/src/kdf/mgf1/info.txt
@@ -1,5 +1,3 @@
-realname "MGF1"
-
define MGF1
load_on dep
diff --git a/src/kdf/ssl_prf/info.txt b/src/kdf/ssl_prf/info.txt
index f862905a2..b306721b9 100644
--- a/src/kdf/ssl_prf/info.txt
+++ b/src/kdf/ssl_prf/info.txt
@@ -1,5 +1,3 @@
-realname "SSLv3 PRF"
-
define SSL_V3_PRF
load_on auto
diff --git a/src/kdf/tls_prf/info.txt b/src/kdf/tls_prf/info.txt
index f95ef9c24..11a0d44f5 100644
--- a/src/kdf/tls_prf/info.txt
+++ b/src/kdf/tls_prf/info.txt
@@ -1,5 +1,3 @@
-realname "TLS v1.0 PRF"
-
define TLS_V10_PRF
load_on auto
diff --git a/src/kdf/x942_prf/info.txt b/src/kdf/x942_prf/info.txt
index 295c2cde6..e38b2aac1 100644
--- a/src/kdf/x942_prf/info.txt
+++ b/src/kdf/x942_prf/info.txt
@@ -1,5 +1,3 @@
-realname "X942 PRF"
-
define X942_PRF
load_on auto
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index 6eaa2f70b..e8271ce99 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -1,5 +1,3 @@
-realname "Botan Libstate Module"
-
load_on always
define LIBSTATE_MODULE
diff --git a/src/libstate/oid_lookup/info.txt b/src/libstate/oid_lookup/info.txt
index 609eb9199..e0f6f099c 100644
--- a/src/libstate/oid_lookup/info.txt
+++ b/src/libstate/oid_lookup/info.txt
@@ -1,5 +1,3 @@
-realname "OID Lookup"
-
load_on dep
define OID_LOOKUP
diff --git a/src/mac/cbc_mac/info.txt b/src/mac/cbc_mac/info.txt
index 3a5434974..80adc5fd0 100644
--- a/src/mac/cbc_mac/info.txt
+++ b/src/mac/cbc_mac/info.txt
@@ -1,5 +1,3 @@
-realname "CBC-MAC"
-
define CBC_MAC
load_on auto
diff --git a/src/mac/cmac/info.txt b/src/mac/cmac/info.txt
index b593c9d38..5dad789de 100644
--- a/src/mac/cmac/info.txt
+++ b/src/mac/cmac/info.txt
@@ -1,5 +1,3 @@
-realname "CMAC"
-
define CMAC
load_on auto
diff --git a/src/mac/hmac/info.txt b/src/mac/hmac/info.txt
index cdf2e67ab..26da83533 100644
--- a/src/mac/hmac/info.txt
+++ b/src/mac/hmac/info.txt
@@ -1,5 +1,3 @@
-realname "HMAC"
-
define HMAC
load_on auto
diff --git a/src/mac/info.txt b/src/mac/info.txt
index 239eb633f..9a839d04d 100644
--- a/src/mac/info.txt
+++ b/src/mac/info.txt
@@ -1,5 +1,3 @@
-realname "Message Authentication Codes"
-
load_on auto
<add>
diff --git a/src/mac/ssl3mac/info.txt b/src/mac/ssl3mac/info.txt
index f8791169c..c4ef54629 100644
--- a/src/mac/ssl3mac/info.txt
+++ b/src/mac/ssl3mac/info.txt
@@ -1,5 +1,3 @@
-realname "SSLv3 MAC"
-
define SSL3_MAC
load_on auto
diff --git a/src/mac/x919_mac/info.txt b/src/mac/x919_mac/info.txt
index f2ebd5b35..16955816c 100644
--- a/src/mac/x919_mac/info.txt
+++ b/src/mac/x919_mac/info.txt
@@ -1,5 +1,3 @@
-realname "ANSI X9.19 MAC"
-
define ANSI_X919_MAC
load_on auto
diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 513703deb..30018b795 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt"
-
load_on auto
define BIGINT
diff --git a/src/math/bigint/monty_amd64/info.txt b/src/math/bigint/monty_amd64/info.txt
index a897045b2..657cd0353 100644
--- a/src/math/bigint/monty_amd64/info.txt
+++ b/src/math/bigint/monty_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "Montgomery Reduction (x86-64)"
-
mp_bits 64
load_on never
diff --git a/src/math/bigint/monty_generic/info.txt b/src/math/bigint/monty_generic/info.txt
index 6f5f0e722..c709229e6 100644
--- a/src/math/bigint/monty_generic/info.txt
+++ b/src/math/bigint/monty_generic/info.txt
@@ -1,5 +1,3 @@
-realname "Montgomery Reduction"
-
load_on dep
<add>
diff --git a/src/math/bigint/mp_amd64/info.txt b/src/math/bigint/mp_amd64/info.txt
index 84a5bcf53..a7da8806e 100644
--- a/src/math/bigint/mp_amd64/info.txt
+++ b/src/math/bigint/mp_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (x86-64)"
-
mp_bits 64
load_on dep
diff --git a/src/math/bigint/mp_asm64/info.txt b/src/math/bigint/mp_asm64/info.txt
index 5c112c490..7bdbffb2c 100644
--- a/src/math/bigint/mp_asm64/info.txt
+++ b/src/math/bigint/mp_asm64/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (Alpha/IA-64/MIPS64/PowerPC-64/SPARC64)"
-
mp_bits 64
load_on dep
diff --git a/src/math/bigint/mp_generic/info.txt b/src/math/bigint/mp_generic/info.txt
index 8bf75fec3..28f258ebb 100644
--- a/src/math/bigint/mp_generic/info.txt
+++ b/src/math/bigint/mp_generic/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (C++)"
-
load_on dep
<add>
diff --git a/src/math/bigint/mp_ia32/info.txt b/src/math/bigint/mp_ia32/info.txt
index 51f98fda8..6e093a7e5 100644
--- a/src/math/bigint/mp_ia32/info.txt
+++ b/src/math/bigint/mp_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (IA-32)"
-
mp_bits 32
load_on asm_ok
diff --git a/src/math/bigint/mp_ia32_msvc/info.txt b/src/math/bigint/mp_ia32_msvc/info.txt
index 9c7ac9b43..52839d89b 100644
--- a/src/math/bigint/mp_ia32_msvc/info.txt
+++ b/src/math/bigint/mp_ia32_msvc/info.txt
@@ -1,5 +1,3 @@
-realname "x86 MPI Assembler Core (MSVC)"
-
mp_bits 32
load_on dep
diff --git a/src/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt
index 77990df80..704e4dad8 100644
--- a/src/math/bigint/mulop_amd64/info.txt
+++ b/src/math/bigint/mulop_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt Multiply-Add (x86-64)"
-
mp_bits 64
load_on never
diff --git a/src/math/bigint/mulop_generic/info.txt b/src/math/bigint/mulop_generic/info.txt
index 28ebe41eb..8fa2a40c9 100644
--- a/src/math/bigint/mulop_generic/info.txt
+++ b/src/math/bigint/mulop_generic/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt Multiply-Add"
-
load_on dep
<add>
diff --git a/src/math/bigint/mulop_ia32/info.txt b/src/math/bigint/mulop_ia32/info.txt
index b995dd8d7..dd554773f 100644
--- a/src/math/bigint/mulop_ia32/info.txt
+++ b/src/math/bigint/mulop_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt Multiply-Add (IA-32)"
-
mp_bits 32
# Out of date, still implements bigint_mul_add_words
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index 1a52144b7..abbdb0a47 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -1,5 +1,3 @@
-realname "GF(p) Math"
-
uses_tr1 yes
load_on auto
diff --git a/src/math/numbertheory/info.txt b/src/math/numbertheory/info.txt
index 1595c7305..527f4fa29 100644
--- a/src/math/numbertheory/info.txt
+++ b/src/math/numbertheory/info.txt
@@ -1,5 +1,3 @@
-realname "Math Functions"
-
load_on auto
define BIGINT_MATH
diff --git a/src/modes/cbc/info.txt b/src/modes/cbc/info.txt
index de81dcb8c..9b4be1b58 100644
--- a/src/modes/cbc/info.txt
+++ b/src/modes/cbc/info.txt
@@ -1,5 +1,3 @@
-realname "CBC block cipher mode"
-
define CBC
load_on auto
diff --git a/src/modes/cfb/info.txt b/src/modes/cfb/info.txt
index d66df1ee7..b68afc7d0 100644
--- a/src/modes/cfb/info.txt
+++ b/src/modes/cfb/info.txt
@@ -1,5 +1,3 @@
-realname "CFB block cipher mode"
-
define CFB
load_on auto
@@ -12,4 +10,3 @@ cfb.h
<requires>
modes
</requires>
-
diff --git a/src/modes/cts/info.txt b/src/modes/cts/info.txt
index 9eb16add5..773254a30 100644
--- a/src/modes/cts/info.txt
+++ b/src/modes/cts/info.txt
@@ -1,5 +1,3 @@
-realname "CTS block cipher mode"
-
define CTS
load_on auto
diff --git a/src/modes/eax/info.txt b/src/modes/eax/info.txt
index d1fc7e0e3..143944f03 100644
--- a/src/modes/eax/info.txt
+++ b/src/modes/eax/info.txt
@@ -1,5 +1,3 @@
-realname "EAX block cipher mode"
-
define EAX
load_on auto
diff --git a/src/modes/ecb/info.txt b/src/modes/ecb/info.txt
index 06b7b4fd2..f5c831169 100644
--- a/src/modes/ecb/info.txt
+++ b/src/modes/ecb/info.txt
@@ -1,5 +1,3 @@
-realname "ECB block cipher mode"
-
define ECB
load_on auto
diff --git a/src/modes/info.txt b/src/modes/info.txt
index e089e74a9..420233b46 100644
--- a/src/modes/info.txt
+++ b/src/modes/info.txt
@@ -1,5 +1,3 @@
-realname "Cipher Mode Base Class"
-
define CIPHER_MODEBASE
load_on auto
diff --git a/src/modes/mode_pad/info.txt b/src/modes/mode_pad/info.txt
index f22cf7411..9629a7202 100644
--- a/src/modes/mode_pad/info.txt
+++ b/src/modes/mode_pad/info.txt
@@ -1,5 +1,3 @@
-realname "Cipher Mode Padding Method"
-
define CIPHER_MODE_PADDING
load_on auto
diff --git a/src/modes/xts/info.txt b/src/modes/xts/info.txt
index 65c7df2f8..871bb987a 100644
--- a/src/modes/xts/info.txt
+++ b/src/modes/xts/info.txt
@@ -1,5 +1,3 @@
-realname "XTS block cipher mode"
-
define XTS
load_on auto
diff --git a/src/mutex/info.txt b/src/mutex/info.txt
index ff79bf753..0f2836b64 100644
--- a/src/mutex/info.txt
+++ b/src/mutex/info.txt
@@ -1,5 +1,3 @@
-realname "Mutex Wrappers"
-
define MUTEX_WRAPPERS
load_on auto
diff --git a/src/mutex/noop_mutex/info.txt b/src/mutex/noop_mutex/info.txt
index 1f49f5e1c..6025959c2 100644
--- a/src/mutex/noop_mutex/info.txt
+++ b/src/mutex/noop_mutex/info.txt
@@ -1,5 +1,3 @@
-realname "No-Op Mutex"
-
load_on auto
define MUTEX_NOOP
diff --git a/src/mutex/pthreads/info.txt b/src/mutex/pthreads/info.txt
index f135dea48..7315c186a 100644
--- a/src/mutex/pthreads/info.txt
+++ b/src/mutex/pthreads/info.txt
@@ -1,5 +1,3 @@
-realname "Pthread Mutex"
-
define MUTEX_PTHREAD
load_on auto
diff --git a/src/mutex/qt_mutex/info.txt b/src/mutex/qt_mutex/info.txt
index a21108c79..922c38ed1 100644
--- a/src/mutex/qt_mutex/info.txt
+++ b/src/mutex/qt_mutex/info.txt
@@ -1,5 +1,3 @@
-realname "Qt Mutex"
-
define MUTEX_QT
note "You'll probably have to add -I/-L flags to the Makefile to find Qt"
diff --git a/src/mutex/win32_crit_section/info.txt b/src/mutex/win32_crit_section/info.txt
index a2d339c3b..ffa8a98e3 100644
--- a/src/mutex/win32_crit_section/info.txt
+++ b/src/mutex/win32_crit_section/info.txt
@@ -1,5 +1,3 @@
-realname "Win32 Mutex"
-
define MUTEX_WIN32
modset win32
diff --git a/src/pbe/info.txt b/src/pbe/info.txt
index c4210b2a7..f58ed1da4 100644
--- a/src/pbe/info.txt
+++ b/src/pbe/info.txt
@@ -1,5 +1,3 @@
-realname "PBE Base"
-
load_on dep
define PASSWORD_BASED_ENCRYPTION
diff --git a/src/pbe/pbes1/info.txt b/src/pbe/pbes1/info.txt
index 70c6baeee..5dcbf9510 100644
--- a/src/pbe/pbes1/info.txt
+++ b/src/pbe/pbes1/info.txt
@@ -1,5 +1,3 @@
-realname "PKCS5 v1.5 PBE"
-
define PBE_PKCS_V15
load_on auto
diff --git a/src/pbe/pbes2/info.txt b/src/pbe/pbes2/info.txt
index cd37b1e69..71fb6ea72 100644
--- a/src/pbe/pbes2/info.txt
+++ b/src/pbe/pbes2/info.txt
@@ -1,5 +1,3 @@
-realname "PKCS5 v2.0 PBE"
-
define PBE_PKCS_V20
load_on auto
diff --git a/src/pk_pad/eme1/info.txt b/src/pk_pad/eme1/info.txt
index 2f61265e2..794254e8e 100644
--- a/src/pk_pad/eme1/info.txt
+++ b/src/pk_pad/eme1/info.txt
@@ -1,5 +1,3 @@
-realname "EME1"
-
define EME1
load_on auto
diff --git a/src/pk_pad/eme_pkcs/info.txt b/src/pk_pad/eme_pkcs/info.txt
index 88d9caf17..95c568452 100644
--- a/src/pk_pad/eme_pkcs/info.txt
+++ b/src/pk_pad/eme_pkcs/info.txt
@@ -1,5 +1,3 @@
-realname "PKCSv1 v1.5 EME"
-
define EME_PKCS1v15
load_on auto
diff --git a/src/pk_pad/emsa1/info.txt b/src/pk_pad/emsa1/info.txt
index 086270b96..55832307b 100644
--- a/src/pk_pad/emsa1/info.txt
+++ b/src/pk_pad/emsa1/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA1"
-
define EMSA1
load_on auto
diff --git a/src/pk_pad/emsa1_bsi/info.txt b/src/pk_pad/emsa1_bsi/info.txt
index 14a9fd396..5e8fe09ca 100644
--- a/src/pk_pad/emsa1_bsi/info.txt
+++ b/src/pk_pad/emsa1_bsi/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA1 (BSI variant)"
-
define EMSA1_BSI
load_on auto
diff --git a/src/pk_pad/emsa2/info.txt b/src/pk_pad/emsa2/info.txt
index 1c8161c5e..a6fff2a02 100644
--- a/src/pk_pad/emsa2/info.txt
+++ b/src/pk_pad/emsa2/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA2"
-
define EMSA2
load_on auto
diff --git a/src/pk_pad/emsa3/info.txt b/src/pk_pad/emsa3/info.txt
index 90e4b9bfc..babd98711 100644
--- a/src/pk_pad/emsa3/info.txt
+++ b/src/pk_pad/emsa3/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA3"
-
define EMSA3
load_on auto
diff --git a/src/pk_pad/emsa4/info.txt b/src/pk_pad/emsa4/info.txt
index 29ef4e0cf..ea1db30a1 100644
--- a/src/pk_pad/emsa4/info.txt
+++ b/src/pk_pad/emsa4/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA4"
-
define EMSA4
load_on auto
diff --git a/src/pk_pad/emsa_raw/info.txt b/src/pk_pad/emsa_raw/info.txt
index 2a88d10fa..4bd850e11 100644
--- a/src/pk_pad/emsa_raw/info.txt
+++ b/src/pk_pad/emsa_raw/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA-Raw"
-
define EMSA_RAW
load_on auto
diff --git a/src/pk_pad/hash_id/info.txt b/src/pk_pad/hash_id/info.txt
index 935432588..af9f5cd4f 100644
--- a/src/pk_pad/hash_id/info.txt
+++ b/src/pk_pad/hash_id/info.txt
@@ -1,5 +1,3 @@
-realname "Hash Function Identifiers"
-
define HASH_ID
load_on auto
diff --git a/src/pk_pad/info.txt b/src/pk_pad/info.txt
index c281b1563..14b05f458 100644
--- a/src/pk_pad/info.txt
+++ b/src/pk_pad/info.txt
@@ -1,5 +1,3 @@
-realname "Public Key EME/EMSA Padding Modes"
-
define PK_PADDING
load_on auto
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 33af9a8e5..8295a74f4 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -1,5 +1,3 @@
-realname "Diffie-Hellman Key Agreement"
-
define DIFFIE_HELLMAN
load_on auto
diff --git a/src/pubkey/dl_algo/info.txt b/src/pubkey/dl_algo/info.txt
index 15a77516b..0ac91c887 100644
--- a/src/pubkey/dl_algo/info.txt
+++ b/src/pubkey/dl_algo/info.txt
@@ -1,5 +1,3 @@
-realname "Discrete Logarithm PK Algorithms"
-
define DL_PUBLIC_KEY_FAMILY
load_on auto
diff --git a/src/pubkey/dl_group/info.txt b/src/pubkey/dl_group/info.txt
index 6b9884a4d..2e5273ac4 100644
--- a/src/pubkey/dl_group/info.txt
+++ b/src/pubkey/dl_group/info.txt
@@ -1,5 +1,3 @@
-realname "DL Group"
-
load_on auto
define DL_GROUP
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index 5138aafc5..d3e950427 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -1,5 +1,3 @@
-realname "DLIES"
-
define DLIES
load_on auto
diff --git a/src/pubkey/dsa/info.txt b/src/pubkey/dsa/info.txt
index c70e02d90..776a5da28 100644
--- a/src/pubkey/dsa/info.txt
+++ b/src/pubkey/dsa/info.txt
@@ -1,5 +1,3 @@
-realname "DSA"
-
define DSA
load_on auto
diff --git a/src/pubkey/ec_dompar/info.txt b/src/pubkey/ec_dompar/info.txt
index 212783725..f32e4fc2f 100644
--- a/src/pubkey/ec_dompar/info.txt
+++ b/src/pubkey/ec_dompar/info.txt
@@ -1,5 +1,3 @@
-realname "ECC Domain Parameters"
-
define ECC_DOMAIN_PARAMATERS
load_on auto
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index 2a3c9a3b2..f45533129 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -1,5 +1,3 @@
-realname "ECC Public Key"
-
define ECC_PUBLIC_KEY_CRYPTO
load_on auto
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index 743440f8f..3da73dd34 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -1,5 +1,3 @@
-realname "ECDSA"
-
define ECDSA
load_on auto
diff --git a/src/pubkey/eckaeg/info.txt b/src/pubkey/eckaeg/info.txt
index 6b78f7de5..3a9768df1 100644
--- a/src/pubkey/eckaeg/info.txt
+++ b/src/pubkey/eckaeg/info.txt
@@ -1,5 +1,3 @@
-realname "ECKAEG"
-
define ECKAEG
load_on auto
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index d7ae614ea..8c55eb909 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -1,5 +1,3 @@
-realname "ElGamal"
-
define ELGAMAL
load_on auto
diff --git a/src/pubkey/if_algo/info.txt b/src/pubkey/if_algo/info.txt
index d2142f42f..ec948aec3 100644
--- a/src/pubkey/if_algo/info.txt
+++ b/src/pubkey/if_algo/info.txt
@@ -1,5 +1,3 @@
-realname "Integer Factorization Algorithms"
-
define IF_PUBLIC_KEY_FAMILY
load_on dep
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index 63af86c47..13cac9ca0 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -1,5 +1,3 @@
-realname "Public Key Base"
-
define PUBLIC_KEY_CRYPTO
load_on auto
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index 9e758643f..360d317c5 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -1,5 +1,3 @@
-realname "Keypair Testing"
-
define KEYPAIR_TESTING
load_on auto
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index c89820aeb..dcf22033e 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -1,5 +1,3 @@
-realname "Nyberg-Rueppel"
-
define NYBERG_RUEPPEL
load_on auto
diff --git a/src/pubkey/pk_codecs/info.txt b/src/pubkey/pk_codecs/info.txt
index 96511a663..55c71b0c9 100644
--- a/src/pubkey/pk_codecs/info.txt
+++ b/src/pubkey/pk_codecs/info.txt
@@ -1,5 +1,3 @@
-realname "PK codecs (PKCS8, X.509)"
-
load_on auto
<add>
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index 7729fd83d..c8bde68d0 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -1,5 +1,3 @@
-realname "RSA"
-
define RSA
load_on auto
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index ada6c37d6..39857bccc 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -1,5 +1,3 @@
-realname "Rabin-Williams"
-
define RW
load_on auto
diff --git a/src/rng/auto_rng/info.txt b/src/rng/auto_rng/info.txt
index 7d5d5ddcc..d5abfc757 100644
--- a/src/rng/auto_rng/info.txt
+++ b/src/rng/auto_rng/info.txt
@@ -1,5 +1,3 @@
-realname "Auto-seeded Random Number Generator"
-
define AUTO_SEEDING_RNG
load_on auto
diff --git a/src/rng/hmac_rng/info.txt b/src/rng/hmac_rng/info.txt
index 2c7f13e0a..f6135ee5a 100644
--- a/src/rng/hmac_rng/info.txt
+++ b/src/rng/hmac_rng/info.txt
@@ -1,5 +1,3 @@
-realname "HMAC RNG"
-
define HMAC_RNG
load_on auto
diff --git a/src/rng/info.txt b/src/rng/info.txt
index 44a41665d..eea122cf9 100644
--- a/src/rng/info.txt
+++ b/src/rng/info.txt
@@ -1,5 +1,3 @@
-realname "Random Number Generators"
-
load_on auto
<add>
diff --git a/src/rng/randpool/info.txt b/src/rng/randpool/info.txt
index cc7f61552..cab276e15 100644
--- a/src/rng/randpool/info.txt
+++ b/src/rng/randpool/info.txt
@@ -1,5 +1,3 @@
-realname "Randpool RNG"
-
define RANDPOOL
load_on auto
diff --git a/src/rng/x931_rng/info.txt b/src/rng/x931_rng/info.txt
index 633eb0268..35836b33b 100644
--- a/src/rng/x931_rng/info.txt
+++ b/src/rng/x931_rng/info.txt
@@ -1,5 +1,3 @@
-realname "ANSI X9.31 PRNG"
-
define X931_RNG
load_on auto
diff --git a/src/s2k/info.txt b/src/s2k/info.txt
index e603fd937..17f2a8c42 100644
--- a/src/s2k/info.txt
+++ b/src/s2k/info.txt
@@ -1,5 +1,3 @@
-realname "String to Key Functions"
-
load_on auto
<add>
diff --git a/src/s2k/pbkdf1/info.txt b/src/s2k/pbkdf1/info.txt
index 4c5b27546..387043f1b 100644
--- a/src/s2k/pbkdf1/info.txt
+++ b/src/s2k/pbkdf1/info.txt
@@ -1,5 +1,3 @@
-realname "Pbkdf1"
-
define PBKDF1
load_on auto
diff --git a/src/s2k/pbkdf2/info.txt b/src/s2k/pbkdf2/info.txt
index 921aeb1ab..56359d13d 100644
--- a/src/s2k/pbkdf2/info.txt
+++ b/src/s2k/pbkdf2/info.txt
@@ -1,5 +1,3 @@
-realname "Pbkdf2"
-
define PBKDF2
load_on auto
diff --git a/src/s2k/pgps2k/info.txt b/src/s2k/pgps2k/info.txt
index 14b75a02b..a1f5b3dfd 100644
--- a/src/s2k/pgps2k/info.txt
+++ b/src/s2k/pgps2k/info.txt
@@ -1,5 +1,3 @@
-realname "Pgps2k"
-
define PGPS2K
load_on auto
diff --git a/src/selftest/info.txt b/src/selftest/info.txt
index c4b61bb99..079fd5030 100644
--- a/src/selftest/info.txt
+++ b/src/selftest/info.txt
@@ -1,5 +1,3 @@
-realname "Selftests"
-
define SELFTESTS
load_on auto
diff --git a/src/stream/arc4/info.txt b/src/stream/arc4/info.txt
index e4689cf69..bb373dbc5 100644
--- a/src/stream/arc4/info.txt
+++ b/src/stream/arc4/info.txt
@@ -1,5 +1,3 @@
-realname "ARC4"
-
define ARC4
load_on auto
diff --git a/src/stream/ctr/info.txt b/src/stream/ctr/info.txt
index 04d14518a..ac4f3f710 100644
--- a/src/stream/ctr/info.txt
+++ b/src/stream/ctr/info.txt
@@ -1,5 +1,3 @@
-realname "CTR mode"
-
define CTR_BE
load_on auto
@@ -13,4 +11,3 @@ ctr.h
block
stream
</requires>
-
diff --git a/src/stream/info.txt b/src/stream/info.txt
index f8f4b22d5..213c42137 100644
--- a/src/stream/info.txt
+++ b/src/stream/info.txt
@@ -1,5 +1,3 @@
-realname "Stream Ciphers"
-
load_on auto
define STREAM_CIPHER
diff --git a/src/stream/ofb/info.txt b/src/stream/ofb/info.txt
index 444fe0ffe..a01e9e1a6 100644
--- a/src/stream/ofb/info.txt
+++ b/src/stream/ofb/info.txt
@@ -1,5 +1,3 @@
-realname "OFB block cipher mode"
-
define OFB
load_on auto
diff --git a/src/stream/salsa20/info.txt b/src/stream/salsa20/info.txt
index db938307b..8171708b0 100644
--- a/src/stream/salsa20/info.txt
+++ b/src/stream/salsa20/info.txt
@@ -1,5 +1,3 @@
-realname "Salsa20"
-
define SALSA20
load_on auto
diff --git a/src/stream/turing/info.txt b/src/stream/turing/info.txt
index c251a0a30..dede0dd39 100644
--- a/src/stream/turing/info.txt
+++ b/src/stream/turing/info.txt
@@ -1,5 +1,3 @@
-realname "Turing"
-
define TURING
load_on auto
diff --git a/src/stream/wid_wake/info.txt b/src/stream/wid_wake/info.txt
index 94416417e..6289e0369 100644
--- a/src/stream/wid_wake/info.txt
+++ b/src/stream/wid_wake/info.txt
@@ -1,5 +1,3 @@
-realname "WiderWake"
-
define WID_WAKE
load_on auto
diff --git a/src/sym_algo/info.txt b/src/sym_algo/info.txt
index 03804a92d..fab46270e 100644
--- a/src/sym_algo/info.txt
+++ b/src/sym_algo/info.txt
@@ -1,5 +1,3 @@
-realname "Symmetric Algorithms"
-
load_on auto
<add>
diff --git a/src/timer/cpu_counter/info.txt b/src/timer/cpu_counter/info.txt
index 025663a84..d95e0fec5 100644
--- a/src/timer/cpu_counter/info.txt
+++ b/src/timer/cpu_counter/info.txt
@@ -1,5 +1,3 @@
-realname "Hardware Timer"
-
define TIMER_HARDWARE
load_on asm_ok
diff --git a/src/timer/gettimeofday/info.txt b/src/timer/gettimeofday/info.txt
index a58e8088d..f8b65b4ba 100644
--- a/src/timer/gettimeofday/info.txt
+++ b/src/timer/gettimeofday/info.txt
@@ -1,5 +1,3 @@
-realname "Unix Timer"
-
define TIMER_UNIX
load_on auto
@@ -30,4 +28,3 @@ tru64
<requires>
timer
</requires>
-
diff --git a/src/timer/info.txt b/src/timer/info.txt
index 6408dca45..1dff5ab6f 100644
--- a/src/timer/info.txt
+++ b/src/timer/info.txt
@@ -1,5 +1,3 @@
-realname "Timer Base Class"
-
define TIMER
load_on auto
diff --git a/src/timer/posix_rt/info.txt b/src/timer/posix_rt/info.txt
index fa530ea1a..4b23a74fc 100644
--- a/src/timer/posix_rt/info.txt
+++ b/src/timer/posix_rt/info.txt
@@ -1,5 +1,3 @@
-realname "POSIX Timer"
-
define TIMER_POSIX
load_on auto
@@ -26,4 +24,3 @@ dragonfly
<requires>
timer
</requires>
-
diff --git a/src/timer/win32_query_perf_ctr/info.txt b/src/timer/win32_query_perf_ctr/info.txt
index 4bb1ddb34..d8611027a 100644
--- a/src/timer/win32_query_perf_ctr/info.txt
+++ b/src/timer/win32_query_perf_ctr/info.txt
@@ -1,5 +1,3 @@
-realname "Win32 Timer"
-
define TIMER_WIN32
modset win32
@@ -23,4 +21,3 @@ windows -> user32.lib
<requires>
timer
</requires>
-
diff --git a/src/tss/info.txt b/src/tss/info.txt
index af4e0b930..11cc471d2 100644
--- a/src/tss/info.txt
+++ b/src/tss/info.txt
@@ -1,5 +1,3 @@
-realname "Threshold Secret Sharing"
-
<requires>
hash
rng
diff --git a/src/utils/asm_amd64/info.txt b/src/utils/asm_amd64/info.txt
index 6fa4d1de5..a5588669c 100644
--- a/src/utils/asm_amd64/info.txt
+++ b/src/utils/asm_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "Assembler Macros (x86-64)"
-
load_on dep
<add>
diff --git a/src/utils/asm_ia32/info.txt b/src/utils/asm_ia32/info.txt
index 8485d33b9..63b57e0f8 100644
--- a/src/utils/asm_ia32/info.txt
+++ b/src/utils/asm_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "Assembler Macros (IA-32)"
-
load_on dep
<add>
diff --git a/src/utils/buf_comp/info.txt b/src/utils/buf_comp/info.txt
index bcbbc23e2..7aea580ce 100644
--- a/src/utils/buf_comp/info.txt
+++ b/src/utils/buf_comp/info.txt
@@ -1,5 +1,3 @@
-realname "Buffered Computation"
-
load_on auto
<add>
diff --git a/src/utils/datastor/info.txt b/src/utils/datastor/info.txt
index 8c38a3ac8..9c995adaf 100644
--- a/src/utils/datastor/info.txt
+++ b/src/utils/datastor/info.txt
@@ -1,5 +1,3 @@
-realname "Datastore"
-
load_on auto
<add>
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 6380fd6c2..3d024fa09 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -1,5 +1,3 @@
-realname "Utility Functions"
-
define UTIL_FUNCTIONS
load_on always