9 files changed, 32 insertions, 1 deletions
diff --git a/src/lib/math/mp/info.txt b/src/lib/math/mp/info.txt
index 0f5b075f0..4d748a495 100644
--- a/src/lib/math/mp/info.txt
+++ b/src/lib/math/mp/info.txt
@@ -11,3 +11,7 @@ mp_core.h
 mp_madd.h
 mp_asmi.h
 </header:internal>
+
+<requires>
+bigint
+</requires>
diff --git a/src/lib/modes/aead/siv/siv.cpp b/src/lib/modes/aead/siv/siv.cpp
index 665d25ec9..1ddfd4d88 100644
--- a/src/lib/modes/aead/siv/siv.cpp
+++ b/src/lib/modes/aead/siv/siv.cpp
@@ -23,6 +23,11 @@ SIV_Mode::SIV_Mode(BlockCipher* cipher) :
       throw Invalid_Argument("SIV requires a 128 bit block cipher");
    }
 
+SIV_Mode::~SIV_Mode()
+   {
+   // for ~unique_ptr
+   }
+
 void SIV_Mode::clear()
    {
    m_ctr->clear();
diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h
index e4454dade..255e4a277 100644
--- a/src/lib/modes/aead/siv/siv.h
+++ b/src/lib/modes/aead/siv/siv.h
@@ -10,11 +10,11 @@
 #define BOTAN_AEAD_SIV_H_
 
 #include <botan/aead.h>
+#include <botan/stream_cipher.h>
 
 namespace Botan {
 
 class BlockCipher;
-class StreamCipher;
 class MessageAuthenticationCode;
 
 /**
@@ -55,6 +55,8 @@ class BOTAN_PUBLIC_API(2,0) SIV_Mode : public AEAD_Mode
    protected:
       explicit SIV_Mode(BlockCipher* cipher);
 
+      ~SIV_Mode();
+
       StreamCipher& ctr() { return *m_ctr; }
 
       void set_ctr_iv(secure_vector<uint8_t> V);
diff --git a/src/lib/pk_pad/emsa.cpp b/src/lib/pk_pad/emsa.cpp
index 2c3370f4d..9904a0e2f 100644
--- a/src/lib/pk_pad/emsa.cpp
+++ b/src/lib/pk_pad/emsa.cpp
@@ -5,6 +5,7 @@
 */
 
 #include <botan/emsa.h>
+#include <botan/hash.h>
 #include <botan/scan_name.h>
 #include <botan/exceptn.h>
 
diff --git a/src/lib/prov/bearssl/info.txt b/src/lib/prov/bearssl/info.txt
index cf38a1fe7..67bdc157d 100644
--- a/src/lib/prov/bearssl/info.txt
+++ b/src/lib/prov/bearssl/info.txt
@@ -11,3 +11,7 @@ bearssl.h
 <libs>
 all!windows -> bearssl
 </libs>
+
+<requires>
+pubkey
+</requires>
diff --git a/src/lib/pubkey/dlies/info.txt b/src/lib/pubkey/dlies/info.txt
index 65e3b22c9..ef14958e2 100644
--- a/src/lib/pubkey/dlies/info.txt
+++ b/src/lib/pubkey/dlies/info.txt
@@ -3,6 +3,7 @@ DLIES -> 20160713
 </defines>
 
 <requires>
+dh
 kdf
 mac
 block
diff --git a/src/lib/pubkey/eckcdsa/info.txt b/src/lib/pubkey/eckcdsa/info.txt
index 7c6b74b04..2bce4aa79 100644
--- a/src/lib/pubkey/eckcdsa/info.txt
+++ b/src/lib/pubkey/eckcdsa/info.txt
@@ -7,9 +7,11 @@ asn1
 bigint
 ec_group
 ecc_key
+emsa1
 hash
 keypair
 numbertheory
 pk_pad
 rng
+sha2_32
 </requires>
diff --git a/src/lib/pubkey/pk_algs.cpp b/src/lib/pubkey/pk_algs.cpp
index 8a39a5ade..e821e7846 100644
--- a/src/lib/pubkey/pk_algs.cpp
+++ b/src/lib/pubkey/pk_algs.cpp
@@ -17,10 +17,18 @@
   #include <botan/dsa.h>
 #endif
 
+#if defined(BOTAN_HAS_DL_GROUP)
+  #include <botan/dl_group.h>
+#endif
+
 #if defined(BOTAN_HAS_DIFFIE_HELLMAN)
   #include <botan/dh.h>
 #endif
 
+#if defined(BOTAN_HAS_ECC_PUBLIC_KEY_CRYPTO)
+  #include <botan/ecc_key.h>
+#endif
+
 #if defined(BOTAN_HAS_ECDSA)
   #include <botan/ecdsa.h>
 #endif
diff --git a/src/lib/stream/shake_cipher/info.txt b/src/lib/stream/shake_cipher/info.txt
index 500a7265d..ca2a0c079 100644
--- a/src/lib/stream/shake_cipher/info.txt
+++ b/src/lib/stream/shake_cipher/info.txt
@@ -1,3 +1,7 @@
 <defines>
 SHAKE_CIPHER -> 20161018
 </defines>
+
+<requires>
+sha3
+</requires>