74 files changed, 29 insertions, 168 deletions
diff --git a/configure.py b/configure.py
index 83ca926be..aa1f43948 100755
--- a/configure.py
+++ b/configure.py
@@ -367,10 +367,8 @@ class ModuleInfo(object):
                       ['add', 'requires', 'os', 'arch', 'cc', 'libs'],
                       { 'load_on': 'auto',
                         'define': None,
-                        'modset': None,
                         'uses_tr1': 'false',
                         'need_isa': None,
-                        'note': '',
                         'mp_bits': 0 })
 
         if self.add == []:
diff --git a/src/alloc/alloc_mmap/info.txt b/src/alloc/alloc_mmap/info.txt
index e6bded3fb..8ecb4df13 100644
--- a/src/alloc/alloc_mmap/info.txt
+++ b/src/alloc/alloc_mmap/info.txt
@@ -1,13 +1,7 @@
 define ALLOC_MMAP
-modset unix
 
 load_on auto
 
-<add>
-mmap_mem.cpp
-mmap_mem.h
-</add>
-
 <os>
 linux
 freebsd
diff --git a/src/codec/openpgp/info.txt b/src/codec/openpgp/info.txt
index f7774b147..af7d3738c 100644
--- a/src/codec/openpgp/info.txt
+++ b/src/codec/openpgp/info.txt
@@ -2,11 +2,6 @@ define OPENPGP_CODEC
 
 load_on auto
 
-<add>
-openpgp.cpp
-openpgp.h
-</add>
-
 <requires>
 crc24
 filters
diff --git a/src/codec/openpgp/openpgp.cpp b/src/codec/openpgp/openpgp.cpp
index bfba828af..f55caf1c8 100644
--- a/src/codec/openpgp/openpgp.cpp
+++ b/src/codec/openpgp/openpgp.cpp
@@ -1,5 +1,5 @@
 /*
-* OpenPGP
+* OpenPGP Codec
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/codec/openpgp/openpgp.h b/src/codec/openpgp/openpgp.h
index 890fcf0e3..7021d5675 100644
--- a/src/codec/openpgp/openpgp.h
+++ b/src/codec/openpgp/openpgp.h
@@ -1,12 +1,12 @@
 /*
-* OpenPGP
+* OpenPGP Codec
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_OPENPGP_H__
-#define BOTAN_OPENPGP_H__
+#ifndef BOTAN_OPENPGP_CODEC_H__
+#define BOTAN_OPENPGP_CODEC_H__
 
 #include <botan/data_src.h>
 #include <string>
diff --git a/src/codec/zlib/info.txt b/src/codec/zlib/info.txt
deleted file mode 100644
index 6556359a8..000000000
--- a/src/codec/zlib/info.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-define COMPRESSOR_ZLIB
-#define COMPRESSOR_ZLIB,COMPRESSOR_GZIP
-
-load_on request
-modset compression
-
-<add>
-zlib.h
-zlib.cpp
-#gzip.h
-#gzip.cpp
-</add>
-
-<libs>
-all -> z
-</libs>
-
-<requires>
-filters
-</requires>
diff --git a/src/aont/info.txt b/src/constructs/aont/info.txt
index 533b70eb5..533b70eb5 100644
--- a/src/aont/info.txt
+++ b/src/constructs/aont/info.txt
diff --git a/src/aont/package.cpp b/src/constructs/aont/package.cpp
index 37bad46c8..37bad46c8 100644
--- a/src/aont/package.cpp
+++ b/src/constructs/aont/package.cpp
diff --git a/src/aont/package.h b/src/constructs/aont/package.h
index 35d2a23fc..35d2a23fc 100644
--- a/src/aont/package.h
+++ b/src/constructs/aont/package.h
diff --git a/src/cryptobox/cryptobox.cpp b/src/constructs/cryptobox/cryptobox.cpp
index ba7553c55..ba7553c55 100644
--- a/src/cryptobox/cryptobox.cpp
+++ b/src/constructs/cryptobox/cryptobox.cpp
diff --git a/src/cryptobox/cryptobox.h b/src/constructs/cryptobox/cryptobox.h
index a30cb244a..a30cb244a 100644
--- a/src/cryptobox/cryptobox.h
+++ b/src/constructs/cryptobox/cryptobox.h
diff --git a/src/cryptobox/info.txt b/src/constructs/cryptobox/info.txt
index 0780f55aa..0780f55aa 100644
--- a/src/cryptobox/info.txt
+++ b/src/constructs/cryptobox/info.txt
diff --git a/src/fpe/fpe.cpp b/src/constructs/fpe/fpe.cpp
index 86e56625d..86e56625d 100644
--- a/src/fpe/fpe.cpp
+++ b/src/constructs/fpe/fpe.cpp
diff --git a/src/fpe/fpe.h b/src/constructs/fpe/fpe.h
index fba1652d3..fba1652d3 100644
--- a/src/fpe/fpe.h
+++ b/src/constructs/fpe/fpe.h
diff --git a/src/fpe/info.txt b/src/constructs/fpe/info.txt
index f7a8c4ae4..f7a8c4ae4 100644
--- a/src/fpe/info.txt
+++ b/src/constructs/fpe/info.txt
diff --git a/src/tss/info.txt b/src/constructs/tss/info.txt
index 11cc471d2..1d7f793ea 100644
--- a/src/tss/info.txt
+++ b/src/constructs/tss/info.txt
@@ -1,3 +1,5 @@
+define THRESHOLD_SECRET_SHARING
+
 <requires>
 hash
 rng
diff --git a/src/tss/tss.cpp b/src/constructs/tss/tss.cpp
index 0782a27d1..0782a27d1 100644
--- a/src/tss/tss.cpp
+++ b/src/constructs/tss/tss.cpp
diff --git a/src/tss/tss.h b/src/constructs/tss/tss.h
index 6e623c193..6e623c193 100644
--- a/src/tss/tss.h
+++ b/src/constructs/tss/tss.h
diff --git a/src/entropy/beos_stats/info.txt b/src/entropy/beos_stats/info.txt
index 84ecf601d..26c3feb75 100644
--- a/src/entropy/beos_stats/info.txt
+++ b/src/entropy/beos_stats/info.txt
@@ -1,13 +1,7 @@
 define ENTROPY_SRC_BEOS
-modset beos
 
 load_on auto
 
-<add>
-es_beos.h
-es_beos.cpp
-</add>
-
 <os>
 beos
 </os>
diff --git a/src/entropy/cryptoapi_rng/info.txt b/src/entropy/cryptoapi_rng/info.txt
index d7a5dbca0..a07892971 100644
--- a/src/entropy/cryptoapi_rng/info.txt
+++ b/src/entropy/cryptoapi_rng/info.txt
@@ -1,14 +1,9 @@
 define ENTROPY_SRC_CAPI
-load_on auto
-modset win32
 
-<add>
-es_capi.h
-es_capi.cpp
-</add>
+load_on auto
 
-# We'll just assume CAPI is there; this is OK except for 3.x, early versions
-# of 95, and maybe NT 3.5
+# We'll just assume CAPI is there; this is OK except for 3.x, early
+# versions of 95, and maybe NT 3.5
 <os>
 windows
 cygwin
diff --git a/src/entropy/dev_random/info.txt b/src/entropy/dev_random/info.txt
index 376f3b4ba..2907d4178 100644
--- a/src/entropy/dev_random/info.txt
+++ b/src/entropy/dev_random/info.txt
@@ -1,12 +1,6 @@
 define ENTROPY_SRC_DEVICE
 
 load_on auto
-modset unix
-
-<add>
-es_dev.h
-es_dev.cpp
-</add>
 
 <os>
 aix
diff --git a/src/entropy/egd/info.txt b/src/entropy/egd/info.txt
index 77e7197dc..be6380fc9 100644
--- a/src/entropy/egd/info.txt
+++ b/src/entropy/egd/info.txt
@@ -1,12 +1,6 @@
 define ENTROPY_SRC_EGD
 
 load_on auto
-modset unix
-
-<add>
-es_egd.h
-es_egd.cpp
-</add>
 
 <libs>
 solaris -> socket
diff --git a/src/entropy/proc_walk/info.txt b/src/entropy/proc_walk/info.txt
index f6302df1a..50b67980a 100644
--- a/src/entropy/proc_walk/info.txt
+++ b/src/entropy/proc_walk/info.txt
@@ -1,12 +1,6 @@
 define ENTROPY_SRC_FTW
 
 load_on auto
-modset unix
-
-<add>
-es_ftw.h
-es_ftw.cpp
-</add>
 
 <os>
 aix
diff --git a/src/entropy/unix_procs/info.txt b/src/entropy/unix_procs/info.txt
index de88cc1b8..529b56966 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/src/entropy/unix_procs/info.txt
@@ -1,16 +1,7 @@
 define ENTROPY_SRC_UNIX
-modset unix,beos
 
 load_on auto
 
-<add>
-es_unix.cpp
-unix_src.cpp
-unix_cmd.cpp
-es_unix.h
-unix_cmd.h
-</add>
-
 <os>
 aix
 beos
diff --git a/src/entropy/win32_stats/info.txt b/src/entropy/win32_stats/info.txt
index da8ea72ff..3af05d502 100644
--- a/src/entropy/win32_stats/info.txt
+++ b/src/entropy/win32_stats/info.txt
@@ -1,16 +1,7 @@
-# Probably not much of an issue anymore
-#note "This module will not run under NT4"
-
 define ENTROPY_SRC_WIN32
-modset win32
 
 load_on auto
 
-<add>
-es_win32.h
-es_win32.cpp
-</add>
-
 <os>
 windows
 cygwin
diff --git a/src/codec/base64/b64_char.cpp b/src/filters/base64/b64_char.cpp
index e5722a0fd..e5722a0fd 100644
--- a/src/codec/base64/b64_char.cpp
+++ b/src/filters/base64/b64_char.cpp
diff --git a/src/codec/base64/base64.cpp b/src/filters/base64/base64.cpp
index 9110dc57e..9110dc57e 100644
--- a/src/codec/base64/base64.cpp
+++ b/src/filters/base64/base64.cpp
diff --git a/src/codec/base64/base64.h b/src/filters/base64/base64.h
index aca02da14..aca02da14 100644
--- a/src/codec/base64/base64.h
+++ b/src/filters/base64/base64.h
diff --git a/src/codec/base64/info.txt b/src/filters/base64/info.txt
index 1d36b948e..1d36b948e 100644
--- a/src/codec/base64/info.txt
+++ b/src/filters/base64/info.txt
diff --git a/src/codec/bzip2/bzip2.cpp b/src/filters/bzip2/bzip2.cpp
index 4cdca5355..4cdca5355 100644
--- a/src/codec/bzip2/bzip2.cpp
+++ b/src/filters/bzip2/bzip2.cpp
diff --git a/src/codec/bzip2/bzip2.h b/src/filters/bzip2/bzip2.h
index f42263537..f42263537 100644
--- a/src/codec/bzip2/bzip2.h
+++ b/src/filters/bzip2/bzip2.h
diff --git a/src/codec/bzip2/info.txt b/src/filters/bzip2/info.txt
index 7fd426f90..0c5eebe95 100644
--- a/src/codec/bzip2/info.txt
+++ b/src/filters/bzip2/info.txt
@@ -1,16 +1,7 @@
-# This module was written by Peter J. Jones
-
-
 define COMPRESSOR_BZIP2
-modset compression
 
 load_on request
 
-<add>
-bzip2.h
-bzip2.cpp
-</add>
-
 <libs>
 all -> bz2
 </libs>
diff --git a/src/filters/fd_unix/info.txt b/src/filters/fd_unix/info.txt
index bdd9b957f..9c3d0acbc 100644
--- a/src/filters/fd_unix/info.txt
+++ b/src/filters/fd_unix/info.txt
@@ -1,13 +1,7 @@
 define PIPE_UNIXFD_IO
-modset unix,beos
 
 load_on auto
 
-<add>
-fd_unix.h
-fd_unix.cpp
-</add>
-
 <os>
 aix
 beos
diff --git a/src/codec/hex/hex.cpp b/src/filters/hex/hex.cpp
index 651899b73..651899b73 100644
--- a/src/codec/hex/hex.cpp
+++ b/src/filters/hex/hex.cpp
diff --git a/src/codec/hex/hex.h b/src/filters/hex/hex.h
index 035bf4ef9..035bf4ef9 100644
--- a/src/codec/hex/hex.h
+++ b/src/filters/hex/hex.h
diff --git a/src/codec/hex/hex_char.cpp b/src/filters/hex/hex_char.cpp
index c28efc5f7..c28efc5f7 100644
--- a/src/codec/hex/hex_char.cpp
+++ b/src/filters/hex/hex_char.cpp
diff --git a/src/codec/hex/info.txt b/src/filters/hex/info.txt
index 817ff1a00..817ff1a00 100644
--- a/src/codec/hex/info.txt
+++ b/src/filters/hex/info.txt
diff --git a/src/filters/info.txt b/src/filters/info.txt
index a76b6b4fe..c4113de58 100644
--- a/src/filters/info.txt
+++ b/src/filters/info.txt
@@ -1,31 +1,6 @@
-load_on auto
-
 define FILTERS
 
-<add>
-algo_filt.cpp
-basefilt.cpp
-basefilt.h
-buf_filt.cpp
-buf_filt.h
-data_snk.cpp
-data_snk.h
-data_src.cpp
-data_src.h
-filter.cpp
-filter.h
-filters.h
-key_filt.h
-out_buf.cpp
-out_buf.h
-pbe.h
-pipe.cpp
-pipe.h
-pipe_io.cpp
-pipe_rw.cpp
-secqueue.cpp
-secqueue.h
-</add>
+load_on auto
 
 <requires>
 alloc
diff --git a/src/modes/cbc/cbc.cpp b/src/filters/modes/cbc/cbc.cpp
index fb7ae8f90..fb7ae8f90 100644
--- a/src/modes/cbc/cbc.cpp
+++ b/src/filters/modes/cbc/cbc.cpp
diff --git a/src/modes/cbc/cbc.h b/src/filters/modes/cbc/cbc.h
index a926ac180..a926ac180 100644
--- a/src/modes/cbc/cbc.h
+++ b/src/filters/modes/cbc/cbc.h
diff --git a/src/modes/cbc/info.txt b/src/filters/modes/cbc/info.txt
index 9b4be1b58..9b4be1b58 100644
--- a/src/modes/cbc/info.txt
+++ b/src/filters/modes/cbc/info.txt
diff --git a/src/modes/cfb/cfb.cpp b/src/filters/modes/cfb/cfb.cpp
index a126bd995..a126bd995 100644
--- a/src/modes/cfb/cfb.cpp
+++ b/src/filters/modes/cfb/cfb.cpp
diff --git a/src/modes/cfb/cfb.h b/src/filters/modes/cfb/cfb.h
index 7810c00e4..7810c00e4 100644
--- a/src/modes/cfb/cfb.h
+++ b/src/filters/modes/cfb/cfb.h
diff --git a/src/modes/cfb/info.txt b/src/filters/modes/cfb/info.txt
index b68afc7d0..b68afc7d0 100644
--- a/src/modes/cfb/info.txt
+++ b/src/filters/modes/cfb/info.txt
diff --git a/src/modes/cts/cts.cpp b/src/filters/modes/cts/cts.cpp
index 99f042f61..99f042f61 100644
--- a/src/modes/cts/cts.cpp
+++ b/src/filters/modes/cts/cts.cpp
diff --git a/src/modes/cts/cts.h b/src/filters/modes/cts/cts.h
index 1a2cae44e..1a2cae44e 100644
--- a/src/modes/cts/cts.h
+++ b/src/filters/modes/cts/cts.h
diff --git a/src/modes/cts/info.txt b/src/filters/modes/cts/info.txt
index 773254a30..773254a30 100644
--- a/src/modes/cts/info.txt
+++ b/src/filters/modes/cts/info.txt
diff --git a/src/modes/eax/eax.cpp b/src/filters/modes/eax/eax.cpp
index e2ef178b6..e2ef178b6 100644
--- a/src/modes/eax/eax.cpp
+++ b/src/filters/modes/eax/eax.cpp
diff --git a/src/modes/eax/eax.h b/src/filters/modes/eax/eax.h
index f569f2ede..f569f2ede 100644
--- a/src/modes/eax/eax.h
+++ b/src/filters/modes/eax/eax.h
diff --git a/src/modes/eax/eax_dec.cpp b/src/filters/modes/eax/eax_dec.cpp
index f395ce437..f395ce437 100644
--- a/src/modes/eax/eax_dec.cpp
+++ b/src/filters/modes/eax/eax_dec.cpp
diff --git a/src/modes/eax/info.txt b/src/filters/modes/eax/info.txt
index 143944f03..143944f03 100644
--- a/src/modes/eax/info.txt
+++ b/src/filters/modes/eax/info.txt
diff --git a/src/modes/ecb/ecb.cpp b/src/filters/modes/ecb/ecb.cpp
index bff6d70f4..bff6d70f4 100644
--- a/src/modes/ecb/ecb.cpp
+++ b/src/filters/modes/ecb/ecb.cpp
diff --git a/src/modes/ecb/ecb.h b/src/filters/modes/ecb/ecb.h
index ff9ea9635..ff9ea9635 100644
--- a/src/modes/ecb/ecb.h
+++ b/src/filters/modes/ecb/ecb.h
diff --git a/src/modes/ecb/info.txt b/src/filters/modes/ecb/info.txt
index f5c831169..f5c831169 100644
--- a/src/modes/ecb/info.txt
+++ b/src/filters/modes/ecb/info.txt
diff --git a/src/modes/info.txt b/src/filters/modes/info.txt
index 420233b46..420233b46 100644
--- a/src/modes/info.txt
+++ b/src/filters/modes/info.txt
diff --git a/src/modes/mode_pad/info.txt b/src/filters/modes/mode_pad/info.txt
index 9629a7202..9629a7202 100644
--- a/src/modes/mode_pad/info.txt
+++ b/src/filters/modes/mode_pad/info.txt
diff --git a/src/modes/mode_pad/mode_pad.cpp b/src/filters/modes/mode_pad/mode_pad.cpp
index 2204c28b5..2204c28b5 100644
--- a/src/modes/mode_pad/mode_pad.cpp
+++ b/src/filters/modes/mode_pad/mode_pad.cpp
diff --git a/src/modes/mode_pad/mode_pad.h b/src/filters/modes/mode_pad/mode_pad.h
index a486d3c1f..a486d3c1f 100644
--- a/src/modes/mode_pad/mode_pad.h
+++ b/src/filters/modes/mode_pad/mode_pad.h
diff --git a/src/modes/modebase.cpp b/src/filters/modes/modebase.cpp
index 59ee55a8a..59ee55a8a 100644
--- a/src/modes/modebase.cpp
+++ b/src/filters/modes/modebase.cpp
diff --git a/src/modes/modebase.h b/src/filters/modes/modebase.h
index 4a15524b6..4a15524b6 100644
--- a/src/modes/modebase.h
+++ b/src/filters/modes/modebase.h
diff --git a/src/modes/xts/info.txt b/src/filters/modes/xts/info.txt
index 871bb987a..871bb987a 100644
--- a/src/modes/xts/info.txt
+++ b/src/filters/modes/xts/info.txt
diff --git a/src/modes/xts/xts.cpp b/src/filters/modes/xts/xts.cpp
index 586cc92af..586cc92af 100644
--- a/src/modes/xts/xts.cpp
+++ b/src/filters/modes/xts/xts.cpp
diff --git a/src/modes/xts/xts.h b/src/filters/modes/xts/xts.h
index 9badd3666..9badd3666 100644
--- a/src/modes/xts/xts.h
+++ b/src/filters/modes/xts/xts.h
diff --git a/src/filters/pk_filts/info.txt b/src/filters/pk_filts/info.txt
new file mode 100644
index 000000000..54d187f47
--- /dev/null
+++ b/src/filters/pk_filts/info.txt
@@ -0,0 +1,8 @@
+define PUBLIC_KEY_CRYPTO
+
+load_on auto
+
+<requires>
+pubkey
+filters
+</requires>
diff --git a/src/pubkey/pk_filts.cpp b/src/filters/pk_filts/pk_filts.cpp
index d604436e0..d604436e0 100644
--- a/src/pubkey/pk_filts.cpp
+++ b/src/filters/pk_filts/pk_filts.cpp
diff --git a/src/pubkey/pk_filts.h b/src/filters/pk_filts/pk_filts.h
index 8bf3fc238..8bf3fc238 100644
--- a/src/pubkey/pk_filts.h
+++ b/src/filters/pk_filts/pk_filts.h
diff --git a/src/filters/zlib/info.txt b/src/filters/zlib/info.txt
new file mode 100644
index 000000000..4a1ea444e
--- /dev/null
+++ b/src/filters/zlib/info.txt
@@ -0,0 +1,11 @@
+define COMPRESSOR_ZLIB
+
+load_on request
+
+<libs>
+all -> z
+</libs>
+
+<requires>
+filters
+</requires>
diff --git a/src/codec/zlib/zlib.cpp b/src/filters/zlib/zlib.cpp
index 246e32924..246e32924 100644
--- a/src/codec/zlib/zlib.cpp
+++ b/src/filters/zlib/zlib.cpp
diff --git a/src/codec/zlib/zlib.h b/src/filters/zlib/zlib.h
index 4a7f3bc80..4a7f3bc80 100644
--- a/src/codec/zlib/zlib.h
+++ b/src/filters/zlib/zlib.h
diff --git a/src/mutex/qt_mutex/info.txt b/src/mutex/qt_mutex/info.txt
index 922c38ed1..346f04c81 100644
--- a/src/mutex/qt_mutex/info.txt
+++ b/src/mutex/qt_mutex/info.txt
@@ -1,14 +1,7 @@
 define MUTEX_QT
 
-note "You'll probably have to add -I/-L flags to the Makefile to find Qt"
-
 load_on request
 
-<add>
-mux_qt.cpp
-mux_qt.h
-</add>
-
 # I think we want to always use qt-mt, not qt -- not much point in supporting
 # mutexes in a single threaded application, after all.
 <libs>
diff --git a/src/mutex/win32_crit_section/info.txt b/src/mutex/win32_crit_section/info.txt
index ffa8a98e3..1533ca2da 100644
--- a/src/mutex/win32_crit_section/info.txt
+++ b/src/mutex/win32_crit_section/info.txt
@@ -1,13 +1,7 @@
 define MUTEX_WIN32
-modset win32
 
 load_on auto
 
-<add>
-mux_win32.cpp
-mux_win32.h
-</add>
-
 <os>
 cygwin
 windows
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index 13cac9ca0..ea6b4cb9b 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -2,21 +2,6 @@ define PUBLIC_KEY_CRYPTO
 
 load_on auto
 
-<add>
-pk_algs.cpp
-pk_algs.h
-pk_filts.cpp
-pk_filts.h
-pk_keys.cpp
-pk_keys.h
-pubkey.cpp
-pubkey.h
-pubkey_enums.cpp
-pubkey_enums.h
-workfactor.cpp
-workfactor.h
-</add>
-
 <requires>
 alloc
 asn1
diff --git a/src/timer/gettimeofday/info.txt b/src/timer/gettimeofday/info.txt
index f8b65b4ba..d1f6f7d74 100644
--- a/src/timer/gettimeofday/info.txt
+++ b/src/timer/gettimeofday/info.txt
@@ -1,12 +1,6 @@
 define TIMER_UNIX
 
 load_on auto
-modset unix,beos
-
-<add>
-tm_unix.cpp
-tm_unix.h
-</add>
 
 <os>
 aix
diff --git a/src/timer/win32_query_perf_ctr/info.txt b/src/timer/win32_query_perf_ctr/info.txt
index d8611027a..67db5bc95 100644
--- a/src/timer/win32_query_perf_ctr/info.txt
+++ b/src/timer/win32_query_perf_ctr/info.txt
@@ -1,13 +1,7 @@
 define TIMER_WIN32
-modset win32
 
 load_on auto
 
-<add>
-tm_win32.cpp
-tm_win32.h
-</add>
-
 <os>
 cygwin
 windows