Guess I won't be needing these

81 files changed, 0 insertions, 81 deletions

diff --git a/src/lib/benchmark/benchmark.cpp b/src/lib/benchmark/benchmark.cpp
index df15ffa6f..c0a680358 100644
--- a/src/lib/benchmark/benchmark.cpp
+++ b/src/lib/benchmark/benchmark.cpp
@@ -12,7 +12,6 @@
 #include <botan/aead.h>
 #include <botan/hash.h>
 #include <botan/mac.h>
-#include <memory>
 #include <vector>
 #include <chrono>
 
diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h
index 3634b2f5b..011c2a2bf 100644
--- a/src/lib/block/cascade/cascade.h
+++ b/src/lib/block/cascade/cascade.h
@@ -9,7 +9,6 @@
 #define BOTAN_CASCADE_H__
 
 #include <botan/block_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/block/lion/lion.h b/src/lib/block/lion/lion.h
index afee95b4e..345cd5da0 100644
--- a/src/lib/block/lion/lion.h
+++ b/src/lib/block/lion/lion.h
@@ -11,7 +11,6 @@
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/block/lubyrack/lubyrack.h b/src/lib/block/lubyrack/lubyrack.h
index 236be53d6..e3bb463bc 100644
--- a/src/lib/block/lubyrack/lubyrack.h
+++ b/src/lib/block/lubyrack/lubyrack.h
@@ -10,7 +10,6 @@
 
 #include <botan/block_cipher.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/cvc/cvc_self.cpp b/src/lib/cert/cvc/cvc_self.cpp
index 46e4960e1..50c8a7c2a 100644
--- a/src/lib/cert/cvc/cvc_self.cpp
+++ b/src/lib/cert/cvc/cvc_self.cpp
@@ -10,7 +10,6 @@
 #include <botan/point_gfp.h>
 #include <botan/oids.h>
 #include <sstream>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/cvc/signed_obj.cpp b/src/lib/cert/cvc/signed_obj.cpp
index 20226fbe7..83c2c33dc 100644
--- a/src/lib/cert/cvc/signed_obj.cpp
+++ b/src/lib/cert/cvc/signed_obj.cpp
@@ -9,7 +9,6 @@
 #include <botan/signed_obj.h>
 #include <botan/pubkey.h>
 #include <botan/oids.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/x509/ocsp.cpp b/src/lib/cert/x509/ocsp.cpp
index a118a9c4e..d848e9608 100644
--- a/src/lib/cert/x509/ocsp.cpp
+++ b/src/lib/cert/x509/ocsp.cpp
@@ -15,7 +15,6 @@
 #include <botan/pubkey.h>
 #include <botan/x509path.h>
 #include <botan/http_util.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/x509/ocsp_types.cpp b/src/lib/cert/x509/ocsp_types.cpp
index be41499ee..e02b4a871 100644
--- a/src/lib/cert/x509/ocsp_types.cpp
+++ b/src/lib/cert/x509/ocsp_types.cpp
@@ -12,7 +12,6 @@
 #include <botan/lookup.h>
 #include <botan/hash.h>
 #include <botan/oids.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/x509/x509_ca.cpp b/src/lib/cert/x509/x509_ca.cpp
index 486d769ef..2857072ea 100644
--- a/src/lib/cert/x509/x509_ca.cpp
+++ b/src/lib/cert/x509/x509_ca.cpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <typeinfo>
 #include <iterator>
-#include <memory>
 #include <set>
 
 namespace Botan {
diff --git a/src/lib/cert/x509/x509_ext.cpp b/src/lib/cert/x509/x509_ext.cpp
index 7cef2969b..f058357c1 100644
--- a/src/lib/cert/x509/x509_ext.cpp
+++ b/src/lib/cert/x509/x509_ext.cpp
@@ -13,7 +13,6 @@
 #include <botan/charset.h>
 #include <botan/internal/bit_ops.h>
 #include <algorithm>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/x509/x509_obj.cpp b/src/lib/cert/x509/x509_obj.cpp
index 37d814ce6..64e995dd3 100644
--- a/src/lib/cert/x509/x509_obj.cpp
+++ b/src/lib/cert/x509/x509_obj.cpp
@@ -14,7 +14,6 @@
 #include <botan/parsing.h>
 #include <botan/pem.h>
 #include <algorithm>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/x509/x509cert.cpp b/src/lib/cert/x509/x509cert.cpp
index 2362cd0cf..b30f97964 100644
--- a/src/lib/cert/x509/x509cert.cpp
+++ b/src/lib/cert/x509/x509cert.cpp
@@ -19,7 +19,6 @@
 #include <algorithm>
 #include <iterator>
 #include <sstream>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/cert/x509/x509path.cpp b/src/lib/cert/x509/x509path.cpp
index 8c32d8f94..edbceaadd 100644
--- a/src/lib/cert/x509/x509path.cpp
+++ b/src/lib/cert/x509/x509path.cpp
@@ -13,7 +13,6 @@
 #include <botan/oids.h>
 #include <algorithm>
 #include <chrono>
-#include <memory>
 #include <iostream>
 
 namespace Botan {
diff --git a/src/lib/cert/x509/x509self.cpp b/src/lib/cert/x509/x509self.cpp
index c13772382..ee602783b 100644
--- a/src/lib/cert/x509/x509self.cpp
+++ b/src/lib/cert/x509/x509self.cpp
@@ -11,7 +11,6 @@
 #include <botan/der_enc.h>
 #include <botan/oids.h>
 #include <botan/pipe.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/constructs/cryptobox_psk/cryptobox_psk.cpp b/src/lib/constructs/cryptobox_psk/cryptobox_psk.cpp
index f22e43b43..8fb3a9aae 100644
--- a/src/lib/constructs/cryptobox_psk/cryptobox_psk.cpp
+++ b/src/lib/constructs/cryptobox_psk/cryptobox_psk.cpp
@@ -9,7 +9,6 @@
 #include <botan/pipe.h>
 #include <botan/lookup.h>
 #include <botan/loadstor.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/constructs/fpe_fe1/fpe_fe1.cpp b/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
index da0ef1081..d52a4effc 100644
--- a/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
+++ b/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
@@ -10,7 +10,6 @@
 #include <botan/hmac.h>
 #include <botan/sha2_32.h>
 #include <stdexcept>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/constructs/rfc3394/rfc3394.cpp b/src/lib/constructs/rfc3394/rfc3394.cpp
index cfe95f40b..ce37b0587 100644
--- a/src/lib/constructs/rfc3394/rfc3394.cpp
+++ b/src/lib/constructs/rfc3394/rfc3394.cpp
@@ -11,7 +11,6 @@
 #include <botan/loadstor.h>
 #include <botan/exceptn.h>
 #include <botan/internal/xor_buf.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/constructs/srp6/srp6.cpp b/src/lib/constructs/srp6/srp6.cpp
index 7bc879350..678dc8978 100644
--- a/src/lib/constructs/srp6/srp6.cpp
+++ b/src/lib/constructs/srp6/srp6.cpp
@@ -9,7 +9,6 @@
 #include <botan/dl_group.h>
 #include <botan/libstate.h>
 #include <botan/numthry.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/constructs/tss/tss.cpp b/src/lib/constructs/tss/tss.cpp
index 2024b39ec..5707c2403 100644
--- a/src/lib/constructs/tss/tss.cpp
+++ b/src/lib/constructs/tss/tss.cpp
@@ -11,7 +11,6 @@
 #include <botan/hex.h>
 #include <botan/sha2_32.h>
 #include <botan/sha160.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/engine/core_engine/core_modes.cpp b/src/lib/engine/core_engine/core_modes.cpp
index fa8c9babf..b29f46c9e 100644
--- a/src/lib/engine/core_engine/core_modes.cpp
+++ b/src/lib/engine/core_engine/core_modes.cpp
@@ -11,7 +11,6 @@
 #include <botan/algo_factory.h>
 #include <botan/mode_pad.h>
 #include <botan/transform_filter.h>
-#include <memory>
 
 #if defined(BOTAN_HAS_MODE_CFB)
   #include <botan/cfb.h>
diff --git a/src/lib/engine/core_engine/lookup_hash.cpp b/src/lib/engine/core_engine/lookup_hash.cpp
index 7a9a0148d..a2d813f90 100644
--- a/src/lib/engine/core_engine/lookup_hash.cpp
+++ b/src/lib/engine/core_engine/lookup_hash.cpp
@@ -8,7 +8,6 @@
 #include <botan/internal/core_engine.h>
 #include <botan/scan_name.h>
 #include <botan/algo_factory.h>
-#include <memory>
 
 #if defined(BOTAN_HAS_ADLER32)
   #include <botan/adler32.h>
diff --git a/src/lib/entropy/proc_walk/proc_walk.h b/src/lib/entropy/proc_walk/proc_walk.h
index 3d4c4e4da..853aeb161 100644
--- a/src/lib/entropy/proc_walk/proc_walk.h
+++ b/src/lib/entropy/proc_walk/proc_walk.h
@@ -9,7 +9,6 @@
 #define BOTAN_ENTROPY_SRC_PROC_WALK_H__
 
 #include <botan/entropy_src.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/filters/basefilt.h b/src/lib/filters/basefilt.h
index be5cb7a26..152c47bec 100644
--- a/src/lib/filters/basefilt.h
+++ b/src/lib/filters/basefilt.h
@@ -11,7 +11,6 @@
 
 #include <botan/filter.h>
 #include <thread>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/filters/transform_filter.h b/src/lib/filters/transform_filter.h
index c7033a060..ee1b61c4d 100644
--- a/src/lib/filters/transform_filter.h
+++ b/src/lib/filters/transform_filter.h
@@ -11,7 +11,6 @@
 #include <botan/transform.h>
 #include <botan/key_filt.h>
 #include <botan/buf_filt.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/hash/comb4p/comb4p.h b/src/lib/hash/comb4p/comb4p.h
index 818990439..066b6f38c 100644
--- a/src/lib/hash/comb4p/comb4p.h
+++ b/src/lib/hash/comb4p/comb4p.h
@@ -9,7 +9,6 @@
 #define BOTAN_COMB4P_H__
 
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/kdf1/kdf1.h b/src/lib/kdf/kdf1/kdf1.h
index 539aeaa6e..638d2a3eb 100644
--- a/src/lib/kdf/kdf1/kdf1.h
+++ b/src/lib/kdf/kdf1/kdf1.h
@@ -10,7 +10,6 @@
 
 #include <botan/kdf.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h
index 60bbf5db1..e0e3630da 100644
--- a/src/lib/kdf/kdf2/kdf2.h
+++ b/src/lib/kdf/kdf2/kdf2.h
@@ -10,7 +10,6 @@
 
 #include <botan/kdf.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/prf_ssl3/prf_ssl3.cpp b/src/lib/kdf/prf_ssl3/prf_ssl3.cpp
index 93901416f..73001e502 100644
--- a/src/lib/kdf/prf_ssl3/prf_ssl3.cpp
+++ b/src/lib/kdf/prf_ssl3/prf_ssl3.cpp
@@ -10,7 +10,6 @@
 #include <botan/exceptn.h>
 #include <botan/sha160.h>
 #include <botan/md5.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/prf_ssl3/prf_ssl3.h b/src/lib/kdf/prf_ssl3/prf_ssl3.h
index 9b9ecb578..bae8badb8 100644
--- a/src/lib/kdf/prf_ssl3/prf_ssl3.h
+++ b/src/lib/kdf/prf_ssl3/prf_ssl3.h
@@ -9,7 +9,6 @@
 #define BOTAN_SSLV3_PRF_H__
 
 #include <botan/kdf.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/prf_tls/prf_tls.h b/src/lib/kdf/prf_tls/prf_tls.h
index 654b7abdb..a442ca8f0 100644
--- a/src/lib/kdf/prf_tls/prf_tls.h
+++ b/src/lib/kdf/prf_tls/prf_tls.h
@@ -10,7 +10,6 @@
 
 #include <botan/kdf.h>
 #include <botan/mac.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/prf_x942/prf_x942.cpp b/src/lib/kdf/prf_x942/prf_x942.cpp
index 149be163f..a1ab6bc92 100644
--- a/src/lib/kdf/prf_x942/prf_x942.cpp
+++ b/src/lib/kdf/prf_x942/prf_x942.cpp
@@ -11,7 +11,6 @@
 #include <botan/sha160.h>
 #include <botan/loadstor.h>
 #include <algorithm>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/libstate/libstate.h b/src/lib/libstate/libstate.h
index d8734966a..d45c045ec 100644
--- a/src/lib/libstate/libstate.h
+++ b/src/lib/libstate/libstate.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/mac/cbc_mac/cbc_mac.h b/src/lib/mac/cbc_mac/cbc_mac.h
index e7285d0cb..d7cb5893c 100644
--- a/src/lib/mac/cbc_mac/cbc_mac.h
+++ b/src/lib/mac/cbc_mac/cbc_mac.h
@@ -10,7 +10,6 @@
 
 #include <botan/mac.h>
 #include <botan/block_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/mac/cmac/cmac.h b/src/lib/mac/cmac/cmac.h
index f363eade5..eb633c168 100644
--- a/src/lib/mac/cmac/cmac.h
+++ b/src/lib/mac/cmac/cmac.h
@@ -10,7 +10,6 @@
 
 #include <botan/mac.h>
 #include <botan/block_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/mac/hmac/hmac.h b/src/lib/mac/hmac/hmac.h
index 359d4e6f3..b08502db4 100644
--- a/src/lib/mac/hmac/hmac.h
+++ b/src/lib/mac/hmac/hmac.h
@@ -10,7 +10,6 @@
 
 #include <botan/mac.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/mac/ssl3mac/ssl3_mac.h b/src/lib/mac/ssl3mac/ssl3_mac.h
index 36b3e7f51..3fb08e7b1 100644
--- a/src/lib/mac/ssl3mac/ssl3_mac.h
+++ b/src/lib/mac/ssl3mac/ssl3_mac.h
@@ -10,7 +10,6 @@
 
 #include <botan/hash.h>
 #include <botan/mac.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/mac/x919_mac/x919_mac.h b/src/lib/mac/x919_mac/x919_mac.h
index 38993af62..97f1e9f89 100644
--- a/src/lib/mac/x919_mac/x919_mac.h
+++ b/src/lib/mac/x919_mac/x919_mac.h
@@ -10,7 +10,6 @@
 
 #include <botan/mac.h>
 #include <botan/block_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/math/numbertheory/dsa_gen.cpp b/src/lib/math/numbertheory/dsa_gen.cpp
index d30a08f1a..f14481f9c 100644
--- a/src/lib/math/numbertheory/dsa_gen.cpp
+++ b/src/lib/math/numbertheory/dsa_gen.cpp
@@ -10,7 +10,6 @@
 #include <botan/hash.h>
 #include <botan/parsing.h>
 #include <algorithm>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h
index a57ef34c1..bf0f35e66 100644
--- a/src/lib/modes/aead/ccm/ccm.h
+++ b/src/lib/modes/aead/ccm/ccm.h
@@ -12,7 +12,6 @@
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
 #include <botan/mac.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/aead/eax/eax.h b/src/lib/modes/aead/eax/eax.h
index 89dfff86f..c27c83ed0 100644
--- a/src/lib/modes/aead/eax/eax.h
+++ b/src/lib/modes/aead/eax/eax.h
@@ -12,7 +12,6 @@
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
 #include <botan/mac.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h
index 3feaece02..41cb189d9 100644
--- a/src/lib/modes/aead/gcm/gcm.h
+++ b/src/lib/modes/aead/gcm/gcm.h
@@ -11,7 +11,6 @@
 #include <botan/aead.h>
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h
index 05bc859e0..24a6c474f 100644
--- a/src/lib/modes/aead/ocb/ocb.h
+++ b/src/lib/modes/aead/ocb/ocb.h
@@ -11,7 +11,6 @@
 #include <botan/aead.h>
 #include <botan/block_cipher.h>
 #include <botan/buf_filt.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h
index 5ab85e133..bca8831b8 100644
--- a/src/lib/modes/aead/siv/siv.h
+++ b/src/lib/modes/aead/siv/siv.h
@@ -12,7 +12,6 @@
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
 #include <botan/mac.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/cbc/cbc.h b/src/lib/modes/cbc/cbc.h
index 707b4a446..88542d476 100644
--- a/src/lib/modes/cbc/cbc.h
+++ b/src/lib/modes/cbc/cbc.h
@@ -11,7 +11,6 @@
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
 #include <botan/mode_pad.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/cfb/cfb.h b/src/lib/modes/cfb/cfb.h
index 9145e5667..56d2fd8e2 100644
--- a/src/lib/modes/cfb/cfb.h
+++ b/src/lib/modes/cfb/cfb.h
@@ -11,7 +11,6 @@
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
 #include <botan/mode_pad.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/ecb/ecb.h b/src/lib/modes/ecb/ecb.h
index b1561bf4f..e0d66eb46 100644
--- a/src/lib/modes/ecb/ecb.h
+++ b/src/lib/modes/ecb/ecb.h
@@ -11,7 +11,6 @@
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
 #include <botan/mode_pad.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/modes/xts/xts.h b/src/lib/modes/xts/xts.h
index 3a83b3864..c9cff2f1d 100644
--- a/src/lib/modes/xts/xts.h
+++ b/src/lib/modes/xts/xts.h
@@ -10,7 +10,6 @@
 
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pbe/pbes2/pbes2.cpp b/src/lib/pbe/pbes2/pbes2.cpp
index d4df1277c..537778f1e 100644
--- a/src/lib/pbe/pbes2/pbes2.cpp
+++ b/src/lib/pbe/pbes2/pbes2.cpp
@@ -16,7 +16,6 @@
 #include <botan/oids.h>
 #include <botan/lookup.h>
 #include <algorithm>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.h b/src/lib/pbkdf/pbkdf1/pbkdf1.h
index 2f14c3f32..f14691dbd 100644
--- a/src/lib/pbkdf/pbkdf1/pbkdf1.h
+++ b/src/lib/pbkdf/pbkdf1/pbkdf1.h
@@ -10,7 +10,6 @@
 
 #include <botan/pbkdf.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.h b/src/lib/pbkdf/pbkdf2/pbkdf2.h
index a88f2dd31..00f8992d2 100644
--- a/src/lib/pbkdf/pbkdf2/pbkdf2.h
+++ b/src/lib/pbkdf/pbkdf2/pbkdf2.h
@@ -10,7 +10,6 @@
 
 #include <botan/pbkdf.h>
 #include <botan/mac.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/eme_oaep/oaep.cpp b/src/lib/pk_pad/eme_oaep/oaep.cpp
index 6186ba1e9..9d567f5a9 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.cpp
+++ b/src/lib/pk_pad/eme_oaep/oaep.cpp
@@ -8,7 +8,6 @@
 #include <botan/oaep.h>
 #include <botan/mgf1.h>
 #include <botan/mem_ops.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/eme_oaep/oaep.h b/src/lib/pk_pad/eme_oaep/oaep.h
index 250759821..8d758fcfb 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.h
+++ b/src/lib/pk_pad/eme_oaep/oaep.h
@@ -11,7 +11,6 @@
 #include <botan/eme.h>
 #include <botan/kdf.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/emsa_pssr/pssr.h b/src/lib/pk_pad/emsa_pssr/pssr.h
index 19f490607..7693518f9 100644
--- a/src/lib/pk_pad/emsa_pssr/pssr.h
+++ b/src/lib/pk_pad/emsa_pssr/pssr.h
@@ -10,7 +10,6 @@
 
 #include <botan/emsa.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.h b/src/lib/pk_pad/emsa_x931/emsa_x931.h
index 1436f27eb..b3a1a3501 100644
--- a/src/lib/pk_pad/emsa_x931/emsa_x931.h
+++ b/src/lib/pk_pad/emsa_x931/emsa_x931.h
@@ -10,7 +10,6 @@
 
 #include <botan/emsa.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/prf/hkdf/hkdf.h b/src/lib/prf/hkdf/hkdf.h
index e0b5a7376..6d1c41bec 100644
--- a/src/lib/prf/hkdf/hkdf.h
+++ b/src/lib/prf/hkdf/hkdf.h
@@ -10,7 +10,6 @@
 
 #include <botan/mac.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/dlies/dlies.h b/src/lib/pubkey/dlies/dlies.h
index 643ef95c5..615c560ea 100644
--- a/src/lib/pubkey/dlies/dlies.h
+++ b/src/lib/pubkey/dlies/dlies.h
@@ -11,7 +11,6 @@
 #include <botan/pubkey.h>
 #include <botan/mac.h>
 #include <botan/kdf.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/pkcs8.cpp b/src/lib/pubkey/pkcs8.cpp
index 0dd97a866..7d4c9d802 100644
--- a/src/lib/pubkey/pkcs8.cpp
+++ b/src/lib/pubkey/pkcs8.cpp
@@ -13,7 +13,6 @@
 #include <botan/oids.h>
 #include <botan/pem.h>
 #include <botan/internal/pk_algs.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/pubkey.cpp b/src/lib/pubkey/pubkey.cpp
index 245551c22..2a0acb6ac 100644
--- a/src/lib/pubkey/pubkey.cpp
+++ b/src/lib/pubkey/pubkey.cpp
@@ -14,7 +14,6 @@
 #include <botan/engine.h>
 #include <botan/lookup.h>
 #include <botan/internal/bit_ops.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/pubkey.h b/src/lib/pubkey/pubkey.h
index 431f30f6e..0dc676325 100644
--- a/src/lib/pubkey/pubkey.h
+++ b/src/lib/pubkey/pubkey.h
@@ -15,7 +15,6 @@
 #include <botan/eme.h>
 #include <botan/emsa.h>
 #include <botan/kdf.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/x509_key.cpp b/src/lib/pubkey/x509_key.cpp
index 10395837c..010d24771 100644
--- a/src/lib/pubkey/x509_key.cpp
+++ b/src/lib/pubkey/x509_key.cpp
@@ -11,7 +11,6 @@
 #include <botan/pem.h>
 #include <botan/alg_id.h>
 #include <botan/internal/pk_algs.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/rng/auto_rng/auto_rng.h b/src/lib/rng/auto_rng/auto_rng.h
index 13201f251..2ddd136c6 100644
--- a/src/lib/rng/auto_rng/auto_rng.h
+++ b/src/lib/rng/auto_rng/auto_rng.h
@@ -10,7 +10,6 @@
 
 #include <botan/rng.h>
 #include <string>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/rng/rng.h b/src/lib/rng/rng.h
index 8664ccbf7..812b13527 100644
--- a/src/lib/rng/rng.h
+++ b/src/lib/rng/rng.h
@@ -11,7 +11,6 @@
 #include <botan/entropy_src.h>
 #include <botan/exceptn.h>
 #include <string>
-#include <memory>
 #include <mutex>
 
 namespace Botan {
diff --git a/src/lib/stream/ctr/ctr.h b/src/lib/stream/ctr/ctr.h
index c262f4ad9..b7af388da 100644
--- a/src/lib/stream/ctr/ctr.h
+++ b/src/lib/stream/ctr/ctr.h
@@ -10,7 +10,6 @@
 
 #include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/stream/ofb/ofb.h b/src/lib/stream/ofb/ofb.h
index 0d08dac0a..5c288d4bd 100644
--- a/src/lib/stream/ofb/ofb.h
+++ b/src/lib/stream/ofb/ofb.h
@@ -10,7 +10,6 @@
 
 #include <botan/stream_cipher.h>
 #include <botan/block_cipher.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/msg_cert_verify.cpp b/src/lib/tls/msg_cert_verify.cpp
index 436b84c24..4b6d85e51 100644
--- a/src/lib/tls/msg_cert_verify.cpp
+++ b/src/lib/tls/msg_cert_verify.cpp
@@ -9,7 +9,6 @@
 #include <botan/internal/tls_reader.h>
 #include <botan/internal/tls_extensions.h>
 #include <botan/internal/tls_handshake_io.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/msg_client_kex.cpp b/src/lib/tls/msg_client_kex.cpp
index ae8b82fd4..29a47684b 100644
--- a/src/lib/tls/msg_client_kex.cpp
+++ b/src/lib/tls/msg_client_kex.cpp
@@ -17,7 +17,6 @@
 #include <botan/srp6.h>
 #include <botan/rng.h>
 #include <botan/loadstor.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/msg_finished.cpp b/src/lib/tls/msg_finished.cpp
index c018497c8..0d3d0df0b 100644
--- a/src/lib/tls/msg_finished.cpp
+++ b/src/lib/tls/msg_finished.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/internal/tls_messages.h>
 #include <botan/internal/tls_handshake_io.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/msg_hello_verify.cpp b/src/lib/tls/msg_hello_verify.cpp
index f8a117c03..5a8976ae0 100644
--- a/src/lib/tls/msg_hello_verify.cpp
+++ b/src/lib/tls/msg_hello_verify.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/internal/tls_messages.h>
 #include <botan/lookup.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/msg_server_kex.cpp b/src/lib/tls/msg_server_kex.cpp
index b8293d3e8..3a97d7175 100644
--- a/src/lib/tls/msg_server_kex.cpp
+++ b/src/lib/tls/msg_server_kex.cpp
@@ -17,7 +17,6 @@
 #include <botan/rsa.h>
 #include <botan/srp6.h>
 #include <botan/oids.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.cpp b/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.cpp
index bddb7822c..4a46c6fe3 100644
--- a/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.cpp
+++ b/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.cpp
@@ -10,7 +10,6 @@
 #include <botan/lookup.h>
 #include <botan/hex.h>
 #include <botan/loadstor.h>
-#include <memory>
 #include <chrono>
 
 namespace Botan {
diff --git a/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.h b/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.h
index 04e8135a8..e6c7901f7 100644
--- a/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.h
+++ b/src/lib/tls/sessions_sqlite/tls_session_manager_sqlite.h
@@ -10,7 +10,6 @@
 
 #include <botan/tls_session_manager.h>
 #include <botan/rng.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_channel.h b/src/lib/tls/tls_channel.h
index e7b53f563..4e8fb47e5 100644
--- a/src/lib/tls/tls_channel.h
+++ b/src/lib/tls/tls_channel.h
@@ -15,7 +15,6 @@
 #include <botan/x509cert.h>
 #include <vector>
 #include <string>
-#include <memory>
 #include <map>
 
 namespace Botan {
diff --git a/src/lib/tls/tls_client.cpp b/src/lib/tls/tls_client.cpp
index f17247c16..2bbe51fd7 100644
--- a/src/lib/tls/tls_client.cpp
+++ b/src/lib/tls/tls_client.cpp
@@ -9,7 +9,6 @@
 #include <botan/internal/tls_handshake_state.h>
 #include <botan/internal/tls_messages.h>
 #include <botan/internal/stl_util.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_extensions.h b/src/lib/tls/tls_extensions.h
index de3654fd3..caa389ded 100644
--- a/src/lib/tls/tls_extensions.h
+++ b/src/lib/tls/tls_extensions.h
@@ -12,7 +12,6 @@
 #include <botan/tls_magic.h>
 #include <vector>
 #include <string>
-#include <memory>
 #include <map>
 
 namespace Botan {
diff --git a/src/lib/tls/tls_handshake_hash.cpp b/src/lib/tls/tls_handshake_hash.cpp
index 4e7a0b9b7..ed8bee5a3 100644
--- a/src/lib/tls/tls_handshake_hash.cpp
+++ b/src/lib/tls/tls_handshake_hash.cpp
@@ -9,7 +9,6 @@
 #include <botan/tls_exceptn.h>
 #include <botan/libstate.h>
 #include <botan/hash.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_handshake_state.h b/src/lib/tls/tls_handshake_state.h
index 9afcd0374..205d0d8b9 100644
--- a/src/lib/tls/tls_handshake_state.h
+++ b/src/lib/tls/tls_handshake_state.h
@@ -17,7 +17,6 @@
 #include <botan/pk_keys.h>
 #include <botan/pubkey.h>
 #include <functional>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
index 155d2427b..a616b0def 100644
--- a/src/lib/tls/tls_messages.h
+++ b/src/lib/tls/tls_messages.h
@@ -18,7 +18,6 @@
 #include <botan/pkcs8.h>
 #include <botan/x509cert.h>
 #include <vector>
-#include <memory>
 #include <string>
 
 namespace Botan {
diff --git a/src/lib/tls/tls_record.h b/src/lib/tls/tls_record.h
index ef27a0a02..c9f164407 100644
--- a/src/lib/tls/tls_record.h
+++ b/src/lib/tls/tls_record.h
@@ -15,7 +15,6 @@
 #include <botan/stream_cipher.h>
 #include <botan/mac.h>
 #include <vector>
-#include <memory>
 #include <chrono>
 
 namespace Botan {
diff --git a/src/lib/tls/tls_server.cpp b/src/lib/tls/tls_server.cpp
index bc518571b..06a55debb 100644
--- a/src/lib/tls/tls_server.cpp
+++ b/src/lib/tls/tls_server.cpp
@@ -9,7 +9,6 @@
 #include <botan/internal/tls_handshake_state.h>
 #include <botan/internal/tls_messages.h>
 #include <botan/internal/stl_util.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_session.cpp b/src/lib/tls/tls_session.cpp
index 6596804b5..37d6a2c67 100644
--- a/src/lib/tls/tls_session.cpp
+++ b/src/lib/tls/tls_session.cpp
@@ -11,7 +11,6 @@
 #include <botan/asn1_str.h>
 #include <botan/pem.h>
 #include <botan/cryptobox_psk.h>
-#include <memory>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_session_key.cpp b/src/lib/tls/tls_session_key.cpp
index 06cd1d0a1..c13bc5af3 100644
--- a/src/lib/tls/tls_session_key.cpp
+++ b/src/lib/tls/tls_session_key.cpp
@@ -9,7 +9,6 @@
 #include <botan/internal/tls_handshake_state.h>
 #include <botan/internal/tls_messages.h>
 #include <botan/lookup.h>
-#include <memory>
 
 namespace Botan {