53 files changed, 45 insertions, 31 deletions
diff --git a/src/core/info.txt b/src/core/info.txt
index 681f72379..3a9f9f34f 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -11,54 +11,34 @@ sha2
 hmac
 allocators
 filters
+libstate
 timer_base
 </requires>
 
 <add>
 base.cpp
-data_src.cpp
-datastor.cpp
-def_alg.cpp
-def_mode.cpp
-def_powm.cpp
-eng_base.cpp
-engine.cpp
-exceptn.cpp
-get_enc.cpp
-get_pbe.cpp
-init_def.cpp
-init_opt.cpp
-kdf.cpp
-libstate.cpp
-look_pk.cpp
-lookup.cpp
-modules.cpp
-oids.cpp
-pk_pad.cpp
-policy.cpp
-rng.cpp
-s2k.cpp
-symkey.cpp
 base.h
 botan.h
+data_src.cpp
 data_src.h
+datastor.cpp
 datastor.h
+def_powm.cpp
 eng_def.h
-engine.h
 enums.h
+exceptn.cpp
 exceptn.h
-init.h
+kdf.cpp
 kdf.h
-libstate.h
-look_add.h
-look_pk.h
-get_pbe.h
-lookup.h
+modules.cpp
 modules.h
 mutex.h
-oids.h
+pk_pad.cpp
 pk_pad.h
+rng.cpp
 rng.h
+s2k.cpp
 s2k.h
+symkey.cpp
 symkey.h
 </add>
diff --git a/src/core/def_alg.cpp b/src/core/libstate/def_alg.cpp
index cad5dca5a..cad5dca5a 100644
--- a/src/core/def_alg.cpp
+++ b/src/core/libstate/def_alg.cpp
diff --git a/src/core/def_mode.cpp b/src/core/libstate/def_mode.cpp
index b062cc34b..b062cc34b 100644
--- a/src/core/def_mode.cpp
+++ b/src/core/libstate/def_mode.cpp
diff --git a/src/core/eng_base.cpp b/src/core/libstate/eng_base.cpp
index 38234d462..38234d462 100644
--- a/src/core/eng_base.cpp
+++ b/src/core/libstate/eng_base.cpp
diff --git a/src/core/engine.cpp b/src/core/libstate/engine.cpp
index 804ab3580..804ab3580 100644
--- a/src/core/engine.cpp
+++ b/src/core/libstate/engine.cpp
diff --git a/src/core/engine.h b/src/core/libstate/engine.h
index 13007e662..13007e662 100644
--- a/src/core/engine.h
+++ b/src/core/libstate/engine.h
diff --git a/src/core/get_enc.cpp b/src/core/libstate/get_enc.cpp
index fb5952a3e..fb5952a3e 100644
--- a/src/core/get_enc.cpp
+++ b/src/core/libstate/get_enc.cpp
diff --git a/src/core/get_pbe.cpp b/src/core/libstate/get_pbe.cpp
index cd1ed2aa4..cd1ed2aa4 100644
--- a/src/core/get_pbe.cpp
+++ b/src/core/libstate/get_pbe.cpp
diff --git a/src/core/get_pbe.h b/src/core/libstate/get_pbe.h
index e7b434c1f..e7b434c1f 100644
--- a/src/core/get_pbe.h
+++ b/src/core/libstate/get_pbe.h
diff --git a/src/core/libstate/info.txt b/src/core/libstate/info.txt
new file mode 100644
index 000000000..f0040a688
--- /dev/null
+++ b/src/core/libstate/info.txt
@@ -0,0 +1,34 @@
+realname "Botan Core Module"
+
+load_on auto
+
+define CORE_MODULE
+
+<requires>
+aes
+sha1
+</requires>
+
+<add>
+def_alg.cpp
+def_mode.cpp
+eng_base.cpp
+engine.cpp
+get_enc.cpp
+get_pbe.cpp
+init.h
+init_def.cpp
+init_opt.cpp
+libstate.cpp
+look_pk.cpp
+lookup.cpp
+oids.cpp
+policy.cpp
+engine.h
+get_pbe.h
+libstate.h
+look_add.h
+look_pk.h
+lookup.h
+oids.h
+</add>
diff --git a/src/core/init.h b/src/core/libstate/init.h
index f4296a868..f4296a868 100644
--- a/src/core/init.h
+++ b/src/core/libstate/init.h
diff --git a/src/core/init_def.cpp b/src/core/libstate/init_def.cpp
index 03f97252e..03f97252e 100644
--- a/src/core/init_def.cpp
+++ b/src/core/libstate/init_def.cpp
diff --git a/src/core/init_opt.cpp b/src/core/libstate/init_opt.cpp
index 5c4fbee65..5c4fbee65 100644
--- a/src/core/init_opt.cpp
+++ b/src/core/libstate/init_opt.cpp
diff --git a/src/core/libstate.cpp b/src/core/libstate/libstate.cpp
index 60bb24fee..60bb24fee 100644
--- a/src/core/libstate.cpp
+++ b/src/core/libstate/libstate.cpp
diff --git a/src/core/libstate.h b/src/core/libstate/libstate.h
index 4b1221c84..4b1221c84 100644
--- a/src/core/libstate.h
+++ b/src/core/libstate/libstate.h
diff --git a/src/core/look_add.h b/src/core/libstate/look_add.h
index 8c170049d..8c170049d 100644
--- a/src/core/look_add.h
+++ b/src/core/libstate/look_add.h
diff --git a/src/core/look_pk.cpp b/src/core/libstate/look_pk.cpp
index a4062b57c..a4062b57c 100644
--- a/src/core/look_pk.cpp
+++ b/src/core/libstate/look_pk.cpp
diff --git a/src/core/look_pk.h b/src/core/libstate/look_pk.h
index 63756ad22..63756ad22 100644
--- a/src/core/look_pk.h
+++ b/src/core/libstate/look_pk.h
diff --git a/src/core/lookup.cpp b/src/core/libstate/lookup.cpp
index 8e65afb93..8e65afb93 100644
--- a/src/core/lookup.cpp
+++ b/src/core/libstate/lookup.cpp
diff --git a/src/core/lookup.h b/src/core/libstate/lookup.h
index 016ad4618..016ad4618 100644
--- a/src/core/lookup.h
+++ b/src/core/libstate/lookup.h
diff --git a/src/core/oids.cpp b/src/core/libstate/oids.cpp
index 0823625ea..0823625ea 100644
--- a/src/core/oids.cpp
+++ b/src/core/libstate/oids.cpp
diff --git a/src/core/oids.h b/src/core/libstate/oids.h
index b5be0e01f..b5be0e01f 100644
--- a/src/core/oids.h
+++ b/src/core/libstate/oids.h
diff --git a/src/core/policy.cpp b/src/core/libstate/policy.cpp
index 39810760b..39810760b 100644
--- a/src/core/policy.cpp
+++ b/src/core/libstate/policy.cpp
diff --git a/src/selftest/info.txt b/src/core/selftest/info.txt
index e786437d5..e786437d5 100644
--- a/src/selftest/info.txt
+++ b/src/core/selftest/info.txt
diff --git a/src/selftest/selftest.cpp b/src/core/selftest/selftest.cpp
index 0dede1c9d..0dede1c9d 100644
--- a/src/selftest/selftest.cpp
+++ b/src/core/selftest/selftest.cpp
diff --git a/src/selftest/selftest.h b/src/core/selftest/selftest.h
index ff011a32c..ff011a32c 100644
--- a/src/selftest/selftest.h
+++ b/src/core/selftest/selftest.h
diff --git a/src/mutex/noop_mutex/info.txt b/src/utils/mutex/noop_mutex/info.txt
index 1f49f5e1c..1f49f5e1c 100644
--- a/src/mutex/noop_mutex/info.txt
+++ b/src/utils/mutex/noop_mutex/info.txt
diff --git a/src/mutex/noop_mutex/mux_noop.cpp b/src/utils/mutex/noop_mutex/mux_noop.cpp
index eb3a12702..eb3a12702 100644
--- a/src/mutex/noop_mutex/mux_noop.cpp
+++ b/src/utils/mutex/noop_mutex/mux_noop.cpp
diff --git a/src/mutex/noop_mutex/mux_noop.h b/src/utils/mutex/noop_mutex/mux_noop.h
index a5b802cc0..a5b802cc0 100644
--- a/src/mutex/noop_mutex/mux_noop.h
+++ b/src/utils/mutex/noop_mutex/mux_noop.h
diff --git a/src/mutex/pthreads/info.txt b/src/utils/mutex/pthreads/info.txt
index 88de70de0..88de70de0 100644
--- a/src/mutex/pthreads/info.txt
+++ b/src/utils/mutex/pthreads/info.txt
diff --git a/src/mutex/pthreads/mux_pthr.cpp b/src/utils/mutex/pthreads/mux_pthr.cpp
index d003fa298..d003fa298 100644
--- a/src/mutex/pthreads/mux_pthr.cpp
+++ b/src/utils/mutex/pthreads/mux_pthr.cpp
diff --git a/src/mutex/pthreads/mux_pthr.h b/src/utils/mutex/pthreads/mux_pthr.h
index efdabfed4..efdabfed4 100644
--- a/src/mutex/pthreads/mux_pthr.h
+++ b/src/utils/mutex/pthreads/mux_pthr.h
diff --git a/src/mutex/qt_mutex/info.txt b/src/utils/mutex/qt_mutex/info.txt
index a21108c79..a21108c79 100644
--- a/src/mutex/qt_mutex/info.txt
+++ b/src/utils/mutex/qt_mutex/info.txt
diff --git a/src/mutex/qt_mutex/mux_qt.cpp b/src/utils/mutex/qt_mutex/mux_qt.cpp
index 421b771c7..421b771c7 100644
--- a/src/mutex/qt_mutex/mux_qt.cpp
+++ b/src/utils/mutex/qt_mutex/mux_qt.cpp
diff --git a/src/mutex/qt_mutex/mux_qt.h b/src/utils/mutex/qt_mutex/mux_qt.h
index fffdc78ae..fffdc78ae 100644
--- a/src/mutex/qt_mutex/mux_qt.h
+++ b/src/utils/mutex/qt_mutex/mux_qt.h
diff --git a/src/mutex/win32_crit_section/info.txt b/src/utils/mutex/win32_crit_section/info.txt
index d235ff73c..d235ff73c 100644
--- a/src/mutex/win32_crit_section/info.txt
+++ b/src/utils/mutex/win32_crit_section/info.txt
diff --git a/src/mutex/win32_crit_section/mux_win32.cpp b/src/utils/mutex/win32_crit_section/mux_win32.cpp
index 622a707fa..622a707fa 100644
--- a/src/mutex/win32_crit_section/mux_win32.cpp
+++ b/src/utils/mutex/win32_crit_section/mux_win32.cpp
diff --git a/src/mutex/win32_crit_section/mux_win32.h b/src/utils/mutex/win32_crit_section/mux_win32.h
index 20b245967..20b245967 100644
--- a/src/mutex/win32_crit_section/mux_win32.h
+++ b/src/utils/mutex/win32_crit_section/mux_win32.h
diff --git a/src/timer/cpu_counter/info.txt b/src/utils/timer/cpu_counter/info.txt
index eef6be5a2..eef6be5a2 100644
--- a/src/timer/cpu_counter/info.txt
+++ b/src/utils/timer/cpu_counter/info.txt
diff --git a/src/timer/cpu_counter/tm_hard.cpp b/src/utils/timer/cpu_counter/tm_hard.cpp
index 2f7516930..2f7516930 100644
--- a/src/timer/cpu_counter/tm_hard.cpp
+++ b/src/utils/timer/cpu_counter/tm_hard.cpp
diff --git a/src/timer/cpu_counter/tm_hard.h b/src/utils/timer/cpu_counter/tm_hard.h
index 678513f81..678513f81 100644
--- a/src/timer/cpu_counter/tm_hard.h
+++ b/src/utils/timer/cpu_counter/tm_hard.h
diff --git a/src/timer/gettimeofday/info.txt b/src/utils/timer/gettimeofday/info.txt
index c079dfd58..c079dfd58 100644
--- a/src/timer/gettimeofday/info.txt
+++ b/src/utils/timer/gettimeofday/info.txt
diff --git a/src/timer/gettimeofday/tm_unix.cpp b/src/utils/timer/gettimeofday/tm_unix.cpp
index 654297753..654297753 100644
--- a/src/timer/gettimeofday/tm_unix.cpp
+++ b/src/utils/timer/gettimeofday/tm_unix.cpp
diff --git a/src/timer/gettimeofday/tm_unix.h b/src/utils/timer/gettimeofday/tm_unix.h
index fd24a1563..fd24a1563 100644
--- a/src/timer/gettimeofday/tm_unix.h
+++ b/src/utils/timer/gettimeofday/tm_unix.h
diff --git a/src/timer/posix_rt/info.txt b/src/utils/timer/posix_rt/info.txt
index fb1870988..fb1870988 100644
--- a/src/timer/posix_rt/info.txt
+++ b/src/utils/timer/posix_rt/info.txt
diff --git a/src/timer/posix_rt/tm_posix.cpp b/src/utils/timer/posix_rt/tm_posix.cpp
index 601b2b43d..601b2b43d 100644
--- a/src/timer/posix_rt/tm_posix.cpp
+++ b/src/utils/timer/posix_rt/tm_posix.cpp
diff --git a/src/timer/posix_rt/tm_posix.h b/src/utils/timer/posix_rt/tm_posix.h
index fc3ccdc74..fc3ccdc74 100644
--- a/src/timer/posix_rt/tm_posix.h
+++ b/src/utils/timer/posix_rt/tm_posix.h
diff --git a/src/timer/timer_base/info.txt b/src/utils/timer/timer_base/info.txt
index 3637d4c94..3637d4c94 100644
--- a/src/timer/timer_base/info.txt
+++ b/src/utils/timer/timer_base/info.txt
diff --git a/src/timer/timer_base/timers.cpp b/src/utils/timer/timer_base/timers.cpp
index 4f482916f..4f482916f 100644
--- a/src/timer/timer_base/timers.cpp
+++ b/src/utils/timer/timer_base/timers.cpp
diff --git a/src/timer/timer_base/timers.h b/src/utils/timer/timer_base/timers.h
index 253f71f6b..253f71f6b 100644
--- a/src/timer/timer_base/timers.h
+++ b/src/utils/timer/timer_base/timers.h
diff --git a/src/timer/win32_query_perf_ctr/info.txt b/src/utils/timer/win32_query_perf_ctr/info.txt
index e956f99c5..e956f99c5 100644
--- a/src/timer/win32_query_perf_ctr/info.txt
+++ b/src/utils/timer/win32_query_perf_ctr/info.txt
diff --git a/src/timer/win32_query_perf_ctr/tm_win32.cpp b/src/utils/timer/win32_query_perf_ctr/tm_win32.cpp
index 58f7b0f55..58f7b0f55 100644
--- a/src/timer/win32_query_perf_ctr/tm_win32.cpp
+++ b/src/utils/timer/win32_query_perf_ctr/tm_win32.cpp
diff --git a/src/timer/win32_query_perf_ctr/tm_win32.h b/src/utils/timer/win32_query_perf_ctr/tm_win32.h
index 67b045e78..67b045e78 100644
--- a/src/timer/win32_query_perf_ctr/tm_win32.h
+++ b/src/utils/timer/win32_query_perf_ctr/tm_win32.h