Repository: randombit/botan
Pull request #2519 (2020-11-28 12:27:04)

Make scan_name.h, cpuid.h and http_util.h internal


Patch:
diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp
index f2764c353..5995fdefc 100644
--- a/src/cli/speed.cpp
+++ b/src/cli/speed.cpp
@@ -18,7 +18,7 @@
 
 // Always available:
 #include <botan/entropy_src.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/internal/os_utils.h>
 #include <botan/internal/timer.h>
 #include <botan/version.h>
diff --git a/src/cli/utils.cpp b/src/cli/utils.cpp
index c6d013029..d55ff5878 100644
--- a/src/cli/utils.cpp
+++ b/src/cli/utils.cpp
@@ -8,14 +8,14 @@
 #include "cli.h"
 
 #include <botan/version.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/internal/stl_util.h>
 #include <botan/internal/os_utils.h>
 #include <sstream>
 #include <iomanip>
 
 #if defined(BOTAN_HAS_HTTP_UTIL)
-   #include <botan/http_util.h>
+   #include <botan/internal/http_util.h>
 #endif
 
 #if defined(BOTAN_HAS_UUID)
diff --git a/src/lib/base/info.txt b/src/lib/base/info.txt
index 3bb3d9501..f8da0cf50 100644
--- a/src/lib/base/info.txt
+++ b/src/lib/base/info.txt
@@ -1,7 +1,6 @@
 <header:public>
 buf_comp.h
 secmem.h
-scan_name.h
 sym_algo.h
 symkey.h
 </header:public>
diff --git a/src/lib/block/aes/aes.cpp b/src/lib/block/aes/aes.cpp
index 72acfa0c9..303154b9d 100644
--- a/src/lib/block/aes/aes.cpp
+++ b/src/lib/block/aes/aes.cpp
@@ -6,7 +6,7 @@
 
 #include <botan/internal/aes.h>
 #include <botan/internal/loadstor.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/internal/rotate.h>
 #include <botan/internal/bit_ops.h>
 #include <botan/internal/ct_utils.h>
diff --git a/src/lib/block/aes/aes_power8/aes_power8.cpp b/src/lib/block/aes/aes_power8/aes_power8.cpp
index e05ce366e..458cef315 100644
--- a/src/lib/block/aes/aes_power8/aes_power8.cpp
+++ b/src/lib/block/aes/aes_power8/aes_power8.cpp
@@ -10,7 +10,7 @@
 */
 
 #include <botan/internal/aes.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 #include <altivec.h>
 #undef vector
diff --git a/src/lib/block/aria/aria.cpp b/src/lib/block/aria/aria.cpp
index 565f25462..9ff324e49 100644
--- a/src/lib/block/aria/aria.cpp
+++ b/src/lib/block/aria/aria.cpp
@@ -19,7 +19,7 @@
 #include <botan/internal/aria.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp
index 2450ead96..2e43d337a 100644
--- a/src/lib/block/block_cipher.cpp
+++ b/src/lib/block/block_cipher.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/block_cipher.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_AES)
diff --git a/src/lib/block/idea/idea.cpp b/src/lib/block/idea/idea.cpp
index f5e15e325..dd4868c74 100644
--- a/src/lib/block/idea/idea.cpp
+++ b/src/lib/block/idea/idea.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/internal/idea.h>
 #include <botan/internal/loadstor.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/internal/ct_utils.h>
 
 namespace Botan {
diff --git a/src/lib/block/noekeon/noekeon.cpp b/src/lib/block/noekeon/noekeon.cpp
index 7586176c4..c5b347981 100644
--- a/src/lib/block/noekeon/noekeon.cpp
+++ b/src/lib/block/noekeon/noekeon.cpp
@@ -8,7 +8,7 @@
 #include <botan/internal/noekeon.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/block/serpent/serpent.cpp b/src/lib/block/serpent/serpent.cpp
index 412b173a5..7c4384d3d 100644
--- a/src/lib/block/serpent/serpent.cpp
+++ b/src/lib/block/serpent/serpent.cpp
@@ -11,7 +11,7 @@
 #include <botan/internal/serpent_sbox.h>
 
 #if defined(BOTAN_HAS_SERPENT_SIMD) || defined(BOTAN_HAS_SERPENT_AVX2)
-  #include <botan/cpuid.h>
+  #include <botan/internal/cpuid.h>
 #endif
 
 namespace Botan {
diff --git a/src/lib/block/shacal2/shacal2.cpp b/src/lib/block/shacal2/shacal2.cpp
index 3617708e6..0c6ee28e8 100644
--- a/src/lib/block/shacal2/shacal2.cpp
+++ b/src/lib/block/shacal2/shacal2.cpp
@@ -8,7 +8,7 @@
 #include <botan/internal/shacal2.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/block/sm4/sm4.cpp b/src/lib/block/sm4/sm4.cpp
index 515543ed0..96246ca42 100644
--- a/src/lib/block/sm4/sm4.cpp
+++ b/src/lib/block/sm4/sm4.cpp
@@ -9,7 +9,7 @@
 #include <botan/internal/sm4.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/block/threefish_512/threefish_512.cpp b/src/lib/block/threefish_512/threefish_512.cpp
index 9c202caae..590087382 100644
--- a/src/lib/block/threefish_512/threefish_512.cpp
+++ b/src/lib/block/threefish_512/threefish_512.cpp
@@ -8,7 +8,7 @@
 #include <botan/internal/threefish_512.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/entropy/rdseed/rdseed.cpp b/src/lib/entropy/rdseed/rdseed.cpp
index 1830edf9d..fe6669ee2 100644
--- a/src/lib/entropy/rdseed/rdseed.cpp
+++ b/src/lib/entropy/rdseed/rdseed.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <botan/internal/rdseed.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 #include <immintrin.h>
 
diff --git a/src/lib/hash/hash.cpp b/src/lib/hash/hash.cpp
index 24792e8e1..7d0d15159 100644
--- a/src/lib/hash/hash.cpp
+++ b/src/lib/hash/hash.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/hash.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_ADLER32)
diff --git a/src/lib/hash/sha1/sha160.cpp b/src/lib/hash/sha1/sha160.cpp
index c1033eaa9..70f2f55b8 100644
--- a/src/lib/hash/sha1/sha160.cpp
+++ b/src/lib/hash/sha1/sha160.cpp
@@ -8,7 +8,7 @@
 #include <botan/internal/sha160.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/hash/sha2_32/sha2_32.cpp b/src/lib/hash/sha2_32/sha2_32.cpp
index 8efb8cd07..096028953 100644
--- a/src/lib/hash/sha2_32/sha2_32.cpp
+++ b/src/lib/hash/sha2_32/sha2_32.cpp
@@ -9,7 +9,7 @@
 #include <botan/internal/sha2_32.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/hash/sha2_64/sha2_64.cpp b/src/lib/hash/sha2_64/sha2_64.cpp
index bc0900264..b34623070 100644
--- a/src/lib/hash/sha2_64/sha2_64.cpp
+++ b/src/lib/hash/sha2_64/sha2_64.cpp
@@ -8,7 +8,7 @@
 #include <botan/internal/sha2_64.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp
index 314b92ded..8ff2d06ee 100644
--- a/src/lib/hash/sha3/sha3.cpp
+++ b/src/lib/hash/sha3/sha3.cpp
@@ -9,7 +9,7 @@
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
 #include <botan/exceptn.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/kdf.cpp b/src/lib/kdf/kdf.cpp
index 87a6bb5f6..3a4a7fa6e 100644
--- a/src/lib/kdf/kdf.cpp
+++ b/src/lib/kdf/kdf.cpp
@@ -8,7 +8,7 @@
 #include <botan/kdf.h>
 #include <botan/mac.h>
 #include <botan/hash.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_HKDF)
diff --git a/src/lib/kdf/sp800_56a/sp800_56a.cpp b/src/lib/kdf/sp800_56a/sp800_56a.cpp
index 06d724da6..bc9fec20d 100644
--- a/src/lib/kdf/sp800_56a/sp800_56a.cpp
+++ b/src/lib/kdf/sp800_56a/sp800_56a.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <botan/internal/sp800_56a.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 
 namespace Botan {
diff --git a/src/lib/mac/mac.cpp b/src/lib/mac/mac.cpp
index 4faebb0e9..a9ccef759 100644
--- a/src/lib/mac/mac.cpp
+++ b/src/lib/mac/mac.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/mac.h>
 #include <botan/exceptn.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/mem_ops.h>
 
 #if defined(BOTAN_HAS_CMAC)
diff --git a/src/lib/modes/aead/aead.cpp b/src/lib/modes/aead/aead.cpp
index d8aa762ac..98a127866 100644
--- a/src/lib/modes/aead/aead.cpp
+++ b/src/lib/modes/aead/aead.cpp
@@ -5,7 +5,7 @@
 */
 
 #include <botan/aead.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/internal/parsing.h>
 #include <sstream>
 
diff --git a/src/lib/modes/cipher_mode.cpp b/src/lib/modes/cipher_mode.cpp
index b41c103e6..4d6067fbd 100644
--- a/src/lib/modes/cipher_mode.cpp
+++ b/src/lib/modes/cipher_mode.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/cipher_mode.h>
 #include <botan/internal/stream_mode.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/internal/parsing.h>
 #include <sstream>
 
diff --git a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h
index 0d459e8db..ab5e62288 100644
--- a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h
+++ b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h
@@ -9,7 +9,7 @@
 
 #include <botan/pwdhash.h>
 
-BOTAN_FUTURE_INTERNAL_HEADER(bcrypt_pbkdf.h)
+//BOTAN_FUTURE_INTERNAL_HEADER(bcrypt_pbkdf.h)
 
 namespace Botan {
 
diff --git a/src/lib/pbkdf/pbkdf.cpp b/src/lib/pbkdf/pbkdf.cpp
index 1434ec183..a8df78376 100644
--- a/src/lib/pbkdf/pbkdf.cpp
+++ b/src/lib/pbkdf/pbkdf.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/pbkdf.h>
 #include <botan/exceptn.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 
 #if defined(BOTAN_HAS_PBKDF2)
 #include <botan/pbkdf2.h>
diff --git a/src/lib/pbkdf/pwdhash.cpp b/src/lib/pbkdf/pwdhash.cpp
index 718024a22..9680604b2 100644
--- a/src/lib/pbkdf/pwdhash.cpp
+++ b/src/lib/pbkdf/pwdhash.cpp
@@ -6,7 +6,7 @@
 
 #include <botan/pwdhash.h>
 #include <botan/exceptn.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 
 #if defined(BOTAN_HAS_PBKDF2)
    #include <botan/pbkdf2.h>
diff --git a/src/lib/pk_pad/eme.cpp b/src/lib/pk_pad/eme.cpp
index cffa446e0..042db3fab 100644
--- a/src/lib/pk_pad/eme.cpp
+++ b/src/lib/pk_pad/eme.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/internal/eme.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 #include <botan/internal/parsing.h>
 
diff --git a/src/lib/pk_pad/emsa.cpp b/src/lib/pk_pad/emsa.cpp
index 9394d1e18..63a0488d9 100644
--- a/src/lib/pk_pad/emsa.cpp
+++ b/src/lib/pk_pad/emsa.cpp
@@ -6,7 +6,7 @@
 
 #include <botan/internal/emsa.h>
 #include <botan/hash.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_EMSA1)
diff --git a/src/lib/prov/commoncrypto/commoncrypto_utils.cpp b/src/lib/prov/commoncrypto/commoncrypto_utils.cpp
index 69eb31d37..685f7aa19 100644
--- a/src/lib/prov/commoncrypto/commoncrypto_utils.cpp
+++ b/src/lib/prov/commoncrypto/commoncrypto_utils.cpp
@@ -9,7 +9,7 @@
 #include <botan/internal/commoncrypto_utils.h>
 #include <botan/cipher_mode.h>
 #include <botan/internal/parsing.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 
 namespace Botan {
 
diff --git a/src/lib/prov/pkcs11/p11_mechanism.cpp b/src/lib/prov/pkcs11/p11_mechanism.cpp
index 3d58e8772..04f347814 100644
--- a/src/lib/prov/pkcs11/p11_mechanism.cpp
+++ b/src/lib/prov/pkcs11/p11_mechanism.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <botan/internal/p11_mechanism.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/internal/parsing.h>
 #include <botan/internal/emsa.h>
 
diff --git a/src/lib/pubkey/pkcs8.cpp b/src/lib/pubkey/pkcs8.cpp
index e279bb60a..95d4bf505 100644
--- a/src/lib/pubkey/pkcs8.cpp
+++ b/src/lib/pubkey/pkcs8.cpp
@@ -12,7 +12,7 @@
 #include <botan/asn1_obj.h>
 #include <botan/oids.h>
 #include <botan/pem.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/pk_algs.h>
 
 #if defined(BOTAN_HAS_PKCS5_PBES2)
diff --git a/src/lib/pubkey/xmss/xmss_tools.h b/src/lib/pubkey/xmss/xmss_tools.h
index bbd31fd9f..2b85396a1 100644
--- a/src/lib/pubkey/xmss/xmss_tools.h
+++ b/src/lib/pubkey/xmss/xmss_tools.h
@@ -8,7 +8,7 @@
 #ifndef BOTAN_XMSS_TOOLS_H_
 #define BOTAN_XMSS_TOOLS_H_
 
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/secmem.h>
 #include <iterator>
 #include <type_traits>
diff --git a/src/lib/rng/processor_rng/processor_rng.cpp b/src/lib/rng/processor_rng/processor_rng.cpp
index 6e9aa8680..ee54870f8 100644
--- a/src/lib/rng/processor_rng/processor_rng.cpp
+++ b/src/lib/rng/processor_rng/processor_rng.cpp
@@ -6,7 +6,7 @@
 
 #include <botan/processor_rng.h>
 #include <botan/internal/loadstor.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 #if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) && !defined(BOTAN_USE_GCC_INLINE_ASM)
   #include <immintrin.h>
diff --git a/src/lib/stream/chacha/chacha.cpp b/src/lib/stream/chacha/chacha.cpp
index 8f976cb1a..aa9f8c11c 100644
--- a/src/lib/stream/chacha/chacha.cpp
+++ b/src/lib/stream/chacha/chacha.cpp
@@ -9,7 +9,7 @@
 #include <botan/exceptn.h>
 #include <botan/internal/loadstor.h>
 #include <botan/internal/rotate.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 namespace Botan {
 
diff --git a/src/lib/stream/stream_cipher.cpp b/src/lib/stream/stream_cipher.cpp
index c8e54bbe7..32ced3d4a 100644
--- a/src/lib/stream/stream_cipher.cpp
+++ b/src/lib/stream/stream_cipher.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/stream_cipher.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_CHACHA)
diff --git a/src/lib/utils/cpuid/cpuid.cpp b/src/lib/utils/cpuid/cpuid.cpp
index a85960e71..e75df3900 100644
--- a/src/lib/utils/cpuid/cpuid.cpp
+++ b/src/lib/utils/cpuid/cpuid.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/types.h>
 #include <botan/exceptn.h>
 #include <botan/internal/parsing.h>
diff --git a/src/lib/utils/cpuid/cpuid.h b/src/lib/utils/cpuid/cpuid.h
index 468b004b5..db0bfe1a9 100644
--- a/src/lib/utils/cpuid/cpuid.h
+++ b/src/lib/utils/cpuid/cpuid.h
@@ -13,8 +13,6 @@
 #include <string>
 #include <iosfwd>
 
-BOTAN_FUTURE_INTERNAL_HEADER(cpuid.h)
-
 namespace Botan {
 
 /**
diff --git a/src/lib/utils/cpuid/cpuid_arm.cpp b/src/lib/utils/cpuid/cpuid_arm.cpp
index 0711dfdf3..ab968cb96 100644
--- a/src/lib/utils/cpuid/cpuid_arm.cpp
+++ b/src/lib/utils/cpuid/cpuid_arm.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 #if defined(BOTAN_TARGET_CPU_IS_ARM_FAMILY)
 
diff --git a/src/lib/utils/cpuid/cpuid_ppc.cpp b/src/lib/utils/cpuid/cpuid_ppc.cpp
index 604b97947..dbaf802ad 100644
--- a/src/lib/utils/cpuid/cpuid_ppc.cpp
+++ b/src/lib/utils/cpuid/cpuid_ppc.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/internal/os_utils.h>
 
 #if defined(BOTAN_TARGET_CPU_IS_PPC_FAMILY)
diff --git a/src/lib/utils/cpuid/cpuid_x86.cpp b/src/lib/utils/cpuid/cpuid_x86.cpp
index 6d07ca198..b8ae54f87 100644
--- a/src/lib/utils/cpuid/cpuid_x86.cpp
+++ b/src/lib/utils/cpuid/cpuid_x86.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/mem_ops.h>
 #include <botan/internal/loadstor.h>
 
diff --git a/src/lib/utils/cpuid/info.txt b/src/lib/utils/cpuid/info.txt
index 987d7eae4..3dd65d76e 100644
--- a/src/lib/utils/cpuid/info.txt
+++ b/src/lib/utils/cpuid/info.txt
@@ -1,7 +1,3 @@
 <defines>
 CPUID -> 20170917
 </defines>
-
-<header:public>
-cpuid.h
-</header:public>
diff --git a/src/lib/utils/ghash/ghash.cpp b/src/lib/utils/ghash/ghash.cpp
index ccb83cc5f..af4f52765 100644
--- a/src/lib/utils/ghash/ghash.cpp
+++ b/src/lib/utils/ghash/ghash.cpp
@@ -9,7 +9,7 @@
 #include <botan/internal/ghash.h>
 #include <botan/internal/ct_utils.h>
 #include <botan/internal/loadstor.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/exceptn.h>
 
 namespace Botan {
diff --git a/src/lib/utils/http_util/http_util.cpp b/src/lib/utils/http_util/http_util.cpp
index f2b5f3361..3d56c22bb 100644
--- a/src/lib/utils/http_util/http_util.cpp
+++ b/src/lib/utils/http_util/http_util.cpp
@@ -6,7 +6,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/http_util.h>
+#include <botan/internal/http_util.h>
 #include <botan/internal/parsing.h>
 #include <botan/hex.h>
 #include <botan/internal/os_utils.h>
diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h
index 7ad7c5828..2a4e4955c 100644
--- a/src/lib/utils/http_util/http_util.h
+++ b/src/lib/utils/http_util/http_util.h
@@ -16,8 +16,6 @@
 #include <functional>
 #include <chrono>
 
-BOTAN_FUTURE_INTERNAL_HEADER(http_util.h)
-
 namespace Botan {
 
 namespace HTTP {
diff --git a/src/lib/utils/http_util/info.txt b/src/lib/utils/http_util/info.txt
index a3ebc249e..0004404ad 100644
--- a/src/lib/utils/http_util/info.txt
+++ b/src/lib/utils/http_util/info.txt
@@ -2,10 +2,6 @@
 HTTP_UTIL -> 20171003
 </defines>
 
-<header:public>
-http_util.h
-</header:public>
-
 <requires>
 socket
 </requires>
diff --git a/src/lib/utils/info.txt b/src/lib/utils/info.txt
index 5f9a06c52..43e8d335f 100644
--- a/src/lib/utils/info.txt
+++ b/src/lib/utils/info.txt
@@ -32,6 +32,7 @@ parsing.h
 rotate.h
 rounding.h
 safeint.h
+scan_name.h
 stl_util.h
 timer.h
 </header:internal>
diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp
index 4e536aa24..d76419aa4 100644
--- a/src/lib/utils/os_utils.cpp
+++ b/src/lib/utils/os_utils.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <botan/internal/os_utils.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/exceptn.h>
 #include <botan/mem_ops.h>
 
diff --git a/src/lib/base/scan_name.cpp b/src/lib/utils/scan_name.cpp
similarity index 98%
rename from src/lib/base/scan_name.cpp
rename to src/lib/utils/scan_name.cpp
index 4ea2f3dcd..56c06dcc5 100644
--- a/src/lib/base/scan_name.cpp
+++ b/src/lib/utils/scan_name.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <botan/internal/parsing.h>
 #include <botan/exceptn.h>
 
diff --git a/src/lib/base/scan_name.h b/src/lib/utils/scan_name.h
similarity index 98%
rename from src/lib/base/scan_name.h
rename to src/lib/utils/scan_name.h
index c4b2a034f..ca72eec37 100644
--- a/src/lib/base/scan_name.h
+++ b/src/lib/utils/scan_name.h
@@ -12,8 +12,6 @@
 #include <string>
 #include <vector>
 
-BOTAN_FUTURE_INTERNAL_HEADER(scan_name.h)
-
 namespace Botan {
 
 /**
diff --git a/src/lib/utils/simd/simd_32.h b/src/lib/utils/simd/simd_32.h
index 58d76c277..858c23a7f 100644
--- a/src/lib/utils/simd/simd_32.h
+++ b/src/lib/utils/simd/simd_32.h
@@ -23,7 +23,7 @@
   #define BOTAN_SIMD_USE_ALTIVEC
 
 #elif defined(BOTAN_TARGET_SUPPORTS_NEON)
-  #include <botan/cpuid.h>
+  #include <botan/internal/cpuid.h>
   #include <arm_neon.h>
   #define BOTAN_SIMD_USE_NEON
 
diff --git a/src/lib/utils/uuid/uuid.h b/src/lib/utils/uuid/uuid.h
index 8f95f4d67..a2b08e8cb 100644
--- a/src/lib/utils/uuid/uuid.h
+++ b/src/lib/utils/uuid/uuid.h
@@ -12,7 +12,7 @@
 #include <vector>
 #include <string>
 
-BOTAN_FUTURE_INTERNAL_HEADER(uuid.h)
+//BOTAN_FUTURE_INTERNAL_HEADER(uuid.h)
 
 namespace Botan {
 
diff --git a/src/lib/x509/ocsp.cpp b/src/lib/x509/ocsp.cpp
index 69d216ad0..ec120764a 100644
--- a/src/lib/x509/ocsp.cpp
+++ b/src/lib/x509/ocsp.cpp
@@ -16,7 +16,7 @@
 #include <botan/internal/parsing.h>
 
 #if defined(BOTAN_HAS_HTTP_UTIL)
-  #include <botan/http_util.h>
+  #include <botan/internal/http_util.h>
 #endif
 
 namespace Botan {
diff --git a/src/lib/x509/x509_ca.cpp b/src/lib/x509/x509_ca.cpp
index 9508e9466..63207b336 100644
--- a/src/lib/x509/x509_ca.cpp
+++ b/src/lib/x509/x509_ca.cpp
@@ -17,7 +17,7 @@
 #include <botan/oids.h>
 #include <botan/hash.h>
 #include <botan/internal/emsa.h>
-#include <botan/scan_name.h>
+#include <botan/internal/scan_name.h>
 #include <algorithm>
 #include <iterator>
 
diff --git a/src/lib/x509/x509path.cpp b/src/lib/x509/x509path.cpp
index 840e8f3bf..7a5ff35b1 100644
--- a/src/lib/x509/x509path.cpp
+++ b/src/lib/x509/x509path.cpp
@@ -20,7 +20,7 @@
 
 #if defined(BOTAN_HAS_ONLINE_REVOCATION_CHECKS)
   #include <future>
-  #include <botan/http_util.h>
+  #include <botan/internal/http_util.h>
 #endif
 
 namespace Botan {


Test patch:
diff --git a/src/tests/test_runner.cpp b/src/tests/test_runner.cpp
index ed7cad8ba..3a5fa1db3 100644
--- a/src/tests/test_runner.cpp
+++ b/src/tests/test_runner.cpp
@@ -9,7 +9,7 @@
 
 #include <botan/version.h>
 #include <botan/internal/loadstor.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 #if defined(BOTAN_HAS_THREAD_UTILS)
    #include <botan/internal/thread_pool.h>
diff --git a/src/tests/test_simd.cpp b/src/tests/test_simd.cpp
index 8b9b44d8f..eefe77b6e 100644
--- a/src/tests/test_simd.cpp
+++ b/src/tests/test_simd.cpp
@@ -10,7 +10,7 @@
    #include <botan/internal/simd_32.h>
    #include <botan/internal/bswap.h>
    #include <botan/internal/rotate.h>
-   #include <botan/cpuid.h>
+   #include <botan/internal/cpuid.h>
    #include <botan/internal/loadstor.h>
 #endif
 
diff --git a/src/tests/test_utils.cpp b/src/tests/test_utils.cpp
index 230d86ef9..d6004fb0b 100644
--- a/src/tests/test_utils.cpp
+++ b/src/tests/test_utils.cpp
@@ -14,7 +14,7 @@
 #include <botan/internal/rounding.h>
 #include <botan/internal/ct_utils.h>
 #include <botan/internal/bit_ops.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 #include <botan/internal/charset.h>
 #include <botan/internal/parsing.h>
 #include <botan/version.h>
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 9a8ee66f1..838d864d7 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -13,7 +13,7 @@
 #include <botan/internal/parsing.h>
 #include <botan/internal/filesystem.h>
 #include <botan/internal/stl_util.h>
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
 
 #if defined(BOTAN_HAS_BIGINT)
    #include <botan/bigint.h>