Remove deprecated headers, make more headers internal

Now modules default to internal headers instead of defaulting to public; making
a new public API should be a visible and intentional choice.

Brings the public header count from over 300 to around 150.

Also removes the deprecated tls_blocking interface

2 files changed, 2 insertions, 4 deletions

diff --git a/src/lib/kdf/kdf2/kdf2.cpp b/src/lib/kdf/kdf2/kdf2.cpp
index 4e3bb5583..577176c23 100644
--- a/src/lib/kdf/kdf2/kdf2.cpp
+++ b/src/lib/kdf/kdf2/kdf2.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/kdf2.h>
+#include <botan/internal/kdf2.h>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h
index 43abbf087..1f4d30a4f 100644
--- a/src/lib/kdf/kdf2/kdf2.h
+++ b/src/lib/kdf/kdf2/kdf2.h
@@ -11,14 +11,12 @@
 #include <botan/kdf.h>
 #include <botan/hash.h>
 
-BOTAN_FUTURE_INTERNAL_HEADER(kdf2.h)
-
 namespace Botan {
 
 /**
 * KDF2, from IEEE 1363
 */
-class BOTAN_PUBLIC_API(2,0) KDF2 final : public KDF
+class KDF2 final : public KDF
    {
    public:
       std::string name() const override { return "KDF2(" + m_hash->name() + ")"; }