5 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/constructs/pbes2/info.txt b/src/lib/constructs/pbes2/info.txt
index e1f260966..8a1ca491e 100644
--- a/src/lib/constructs/pbes2/info.txt
+++ b/src/lib/constructs/pbes2/info.txt
@@ -1,7 +1,6 @@
 define PKCS5_PBES2 20141119
 
 <requires>
-algo_factory
 asn1
 block
 cbc
diff --git a/src/lib/constructs/pbes2/pbes2.cpp b/src/lib/constructs/pbes2/pbes2.cpp
index 811806891..17f14170d 100644
--- a/src/lib/constructs/pbes2/pbes2.cpp
+++ b/src/lib/constructs/pbes2/pbes2.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/pbes2.h>
-#include <botan/algo_registry.h>
+#include <botan/internal/algo_registry.h>
 #include <botan/cipher_mode.h>
 #include <botan/pbkdf2.h>
 #include <botan/der_enc.h>
diff --git a/src/lib/constructs/pbes2/pbes2.h b/src/lib/constructs/pbes2/pbes2.h
index 3aa7d1159..90aa4f84b 100644
--- a/src/lib/constructs/pbes2/pbes2.h
+++ b/src/lib/constructs/pbes2/pbes2.h
@@ -11,7 +11,6 @@
 #include <botan/secmem.h>
 #include <botan/transform.h>
 #include <botan/alg_id.h>
-#include <botan/algo_factory.h>
 #include <chrono>
 
 namespace Botan {
diff --git a/src/lib/constructs/rfc3394/info.txt b/src/lib/constructs/rfc3394/info.txt
index 4b62b16e3..8cd5989ca 100644
--- a/src/lib/constructs/rfc3394/info.txt
+++ b/src/lib/constructs/rfc3394/info.txt
@@ -1 +1,5 @@
 define RFC3394_KEYWRAP 20131128
+
+<requires>
+aes
+</requires>
diff --git a/src/lib/constructs/rfc3394/rfc3394.cpp b/src/lib/constructs/rfc3394/rfc3394.cpp
index 6c8b62219..422f2a2dd 100644
--- a/src/lib/constructs/rfc3394/rfc3394.cpp
+++ b/src/lib/constructs/rfc3394/rfc3394.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/rfc3394.h>
-#include <botan/algo_registry.h>
+#include <botan/internal/algo_registry.h>
 #include <botan/block_cipher.h>
 #include <botan/loadstor.h>
 #include <botan/exceptn.h>