Move some files around to break up dependencies between directories

32 files changed, 48 insertions, 16 deletions

diff --git a/src/alloc/info.txt b/src/alloc/info.txt
index 2430a4db4..fa50aa09f 100644
--- a/src/alloc/info.txt
+++ b/src/alloc/info.txt
@@ -4,4 +4,5 @@ load_on auto
 
 <add>
 allocate.h
+secmem.h
 </add>
diff --git a/src/utils/secmem.h b/src/alloc/secmem.h
index d64a376ca..d64a376ca 100644
--- a/src/utils/secmem.h
+++ b/src/alloc/secmem.h
diff --git a/src/asn1/info.txt b/src/asn1/info.txt
index 3c69319b8..7b8110c10 100644
--- a/src/asn1/info.txt
+++ b/src/asn1/info.txt
@@ -24,6 +24,8 @@ der_enc.h
 </add>
 
 <requires>
+alloc
 bigint
+filters
 oid_lookup
 </requires>
diff --git a/src/benchmark/info.txt b/src/benchmark/info.txt
index 958c19ebc..0fbcdb2de 100644
--- a/src/benchmark/info.txt
+++ b/src/benchmark/info.txt
@@ -12,6 +12,7 @@ benchmark.h
 <requires>
 algo_factory
 block
+buf_comp
 hash
 mac
 rng
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
index 726a4ad4f..552e2aacb 100644
--- a/src/cert/x509/info.txt
+++ b/src/cert/x509/info.txt
@@ -33,6 +33,7 @@ x509stor.h
 <requires>
 asn1
 bigint
+datastor
 filters
 libstate
 oid_lookup
diff --git a/src/engine/def_engine/info.txt b/src/engine/def_engine/info.txt
index eb96b0dc5..fd31ee2d0 100644
--- a/src/engine/def_engine/info.txt
+++ b/src/engine/def_engine/info.txt
@@ -18,6 +18,7 @@ lookup_stream.cpp
 <requires>
 algo_factory
 filters
+libstate
 mode_pad
 numbertheory
 </requires>
diff --git a/src/engine/info.txt b/src/engine/info.txt
index bd962e4cf..eef3c03b6 100644
--- a/src/engine/info.txt
+++ b/src/engine/info.txt
@@ -11,6 +11,7 @@ engine.h
 <requires>
 block
 hash
+libstate
 mac
 numbertheory
 stream
diff --git a/src/entropy/info.txt b/src/entropy/info.txt
index bac1d593f..ec3be5f58 100644
--- a/src/entropy/info.txt
+++ b/src/entropy/info.txt
@@ -5,3 +5,7 @@ load_on auto
 <add>
 entropy_src.h
 </add>
+
+<requires>
+buf_comp
+</requires>
diff --git a/src/entropy/proc_walk/info.txt b/src/entropy/proc_walk/info.txt
index d932523fd..9f4836458 100644
--- a/src/entropy/proc_walk/info.txt
+++ b/src/entropy/proc_walk/info.txt
@@ -27,3 +27,7 @@ tru64
 # big deal since it has /dev/*random
 #netbsd
 </os>
+
+<requires>
+alloc
+</requires>
diff --git a/src/entropy/unix_procs/info.txt b/src/entropy/unix_procs/info.txt
index f16e21289..928ec13b3 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/src/entropy/unix_procs/info.txt
@@ -27,3 +27,7 @@ qnx
 solaris
 tru64
 </os>
+
+<requires>
+filters
+</requires>
diff --git a/src/utils/data_src.cpp b/src/filters/data_src.cpp
index e6387c4ba..e6387c4ba 100644
--- a/src/utils/data_src.cpp
+++ b/src/filters/data_src.cpp
diff --git a/src/utils/data_src.h b/src/filters/data_src.h
index e16217e0f..e16217e0f 100644
--- a/src/utils/data_src.h
+++ b/src/filters/data_src.h
diff --git a/src/filters/info.txt b/src/filters/info.txt
index 40d952b0d..79a92a9c5 100644
--- a/src/filters/info.txt
+++ b/src/filters/info.txt
@@ -12,6 +12,8 @@ buf_filt.cpp
 buf_filt.h
 data_snk.cpp
 data_snk.h
+data_src.cpp
+data_src.h
 filter.cpp
 filter.h
 filters.h
@@ -27,6 +29,7 @@ secqueue.h
 </add>
 
 <requires>
+alloc
 asn1
 block
 hash
diff --git a/src/hash/info.txt b/src/hash/info.txt
index fb1f734d7..ce55f7ddc 100644
--- a/src/hash/info.txt
+++ b/src/hash/info.txt
@@ -2,10 +2,10 @@ realname "Hash Functions"
 
 load_on auto
 
-<requires>
-utils
-</requires>
-
 <add>
 hash.h
 </add>
+
+<requires>
+buf_comp
+</requires>
diff --git a/src/hash/skein/info.txt b/src/hash/skein/info.txt
index d2d482d81..bab8497c5 100644
--- a/src/hash/skein/info.txt
+++ b/src/hash/skein/info.txt
@@ -8,3 +8,7 @@ load_on auto
 skein_512.cpp
 skein_512.h
 </add>
+
+<requires>
+alloc
+</requires>
diff --git a/src/kdf/info.txt b/src/kdf/info.txt
index fa5cca334..1965a2098 100644
--- a/src/kdf/info.txt
+++ b/src/kdf/info.txt
@@ -8,3 +8,7 @@ load_on auto
 kdf.cpp
 kdf.h
 </add>
+
+<requires>
+alloc
+</requires>
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index 6e200ee3f..7ca35c5a4 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -18,6 +18,8 @@ lookup.h
 pk_engine.cpp
 pk_engine.h
 policy.cpp
+scan_name.cpp
+scan_name.h
 </add>
 
 <requires>
diff --git a/src/utils/scan_name.cpp b/src/libstate/scan_name.cpp
index ef771871d..ef771871d 100644
--- a/src/utils/scan_name.cpp
+++ b/src/libstate/scan_name.cpp
diff --git a/src/utils/scan_name.h b/src/libstate/scan_name.h
index 9e7af40d6..9e7af40d6 100644
--- a/src/utils/scan_name.h
+++ b/src/libstate/scan_name.h
diff --git a/src/mac/info.txt b/src/mac/info.txt
index 4891d7498..239eb633f 100644
--- a/src/mac/info.txt
+++ b/src/mac/info.txt
@@ -8,5 +8,6 @@ mac.cpp
 </add>
 
 <requires>
+buf_comp
 sym_algo
 </requires>
diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 9c8e1fa17..07b254683 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -24,6 +24,7 @@ mp_shift.cpp
 </add>
 
 <requires>
+alloc
 hex
 mp_ia32
 mp_ia32_msvc
diff --git a/src/pk_pad/hash_id/info.txt b/src/pk_pad/hash_id/info.txt
index 6a9b7f0da..935432588 100644
--- a/src/pk_pad/hash_id/info.txt
+++ b/src/pk_pad/hash_id/info.txt
@@ -8,3 +8,7 @@ load_on auto
 hash_id.cpp
 hash_id.h
 </add>
+
+<requires>
+alloc
+</requires>
diff --git a/src/pk_pad/info.txt b/src/pk_pad/info.txt
index ae773b440..c281b1563 100644
--- a/src/pk_pad/info.txt
+++ b/src/pk_pad/info.txt
@@ -11,5 +11,6 @@ eme.h
 </add>
 
 <requires>
+alloc
 rng
 </requires>
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index c1972052d..2a3c9a3b2 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -10,6 +10,7 @@ ecc_key.h
 </add>
 
 <requires>
+alloc
 asn1
 bigint
 ec_dompar
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index 4ca020ad5..743440f8f 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -14,6 +14,7 @@ ecdsa_op.h
 </add>
 
 <requires>
+alloc
 asn1
 ec_dompar
 ecc_key
diff --git a/src/pubkey/eckaeg/info.txt b/src/pubkey/eckaeg/info.txt
index d18a805ee..6b78f7de5 100644
--- a/src/pubkey/eckaeg/info.txt
+++ b/src/pubkey/eckaeg/info.txt
@@ -14,6 +14,7 @@ eckaeg_op.h
 </add>
 
 <requires>
+alloc
 asn1
 ec_dompar
 ecc_key
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index de58fd271..e33e8e305 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -20,6 +20,7 @@ x509_key.h
 </add>
 
 <requires>
+alloc
 asn1
 bigint
 filters
diff --git a/src/sym_algo/info.txt b/src/sym_algo/info.txt
index f176ed6fb..03804a92d 100644
--- a/src/sym_algo/info.txt
+++ b/src/sym_algo/info.txt
@@ -9,6 +9,7 @@ symkey.h
 </add>
 
 <requires>
+alloc
 filters
 hex
 rng
diff --git a/src/utils/buf_comp.h b/src/utils/buf_comp/buf_comp.h
index 3f1e90bad..3f1e90bad 100644
--- a/src/utils/buf_comp.h
+++ b/src/utils/buf_comp/buf_comp.h
diff --git a/src/utils/datastor.cpp b/src/utils/datastor/datastor.cpp
index 129dad9bf..129dad9bf 100644
--- a/src/utils/datastor.cpp
+++ b/src/utils/datastor/datastor.cpp
diff --git a/src/utils/datastor.h b/src/utils/datastor/datastor.h
index 7ee626fda..7ee626fda 100644
--- a/src/utils/datastor.h
+++ b/src/utils/datastor/datastor.h
diff --git a/src/utils/info.txt b/src/utils/info.txt
index dcf4b9288..36b10df76 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -11,13 +11,10 @@ tru64 -> rt
 <add>
 bit_ops.h
 bswap.h
-buf_comp.h
 charset.cpp
 charset.h
 data_src.cpp
 data_src.h
-datastor.cpp
-datastor.h
 exceptn.cpp
 exceptn.h
 loadstor.h
@@ -26,9 +23,6 @@ mlock.cpp
 parsing.cpp
 parsing.h
 rotate.h
-scan_name.cpp
-scan_name.h
-secmem.h
 stl_util.h
 types.h
 ui.cpp
@@ -39,9 +33,3 @@ version.cpp
 version.h
 xor_buf.h
 </add>
-
-<requires>
-alloc
-filters
-libstate
-</requires>