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, 3 insertions, 5 deletions

diff --git a/src/lib/mac/gmac/gmac.cpp b/src/lib/mac/gmac/gmac.cpp
index 6b162857f..2e594378d 100644
--- a/src/lib/mac/gmac/gmac.cpp
+++ b/src/lib/mac/gmac/gmac.cpp
@@ -6,8 +6,8 @@
  * Botan is released under the Simplified BSD License (see license.txt)
  */
 
-#include <botan/gmac.h>
-#include <botan/ghash.h>
+#include <botan/internal/gmac.h>
+#include <botan/internal/ghash.h>
 #include <botan/exceptn.h>
 #include <botan/block_cipher.h>
 
diff --git a/src/lib/mac/gmac/gmac.h b/src/lib/mac/gmac/gmac.h
index b78aeec6f..5b7052251 100644
--- a/src/lib/mac/gmac/gmac.h
+++ b/src/lib/mac/gmac/gmac.h
@@ -11,8 +11,6 @@
 
 #include <botan/mac.h>
 
-BOTAN_FUTURE_INTERNAL_HEADER(gmac.h)
-
 namespace Botan {
 
 class BlockCipher;
@@ -24,7 +22,7 @@ class GHASH;
 * GMAC requires a unique initialization vector be used for each message.
 * This must be provided via the MessageAuthenticationCode::start() API
 */
-class BOTAN_PUBLIC_API(2,0) GMAC final : public MessageAuthenticationCode
+class GMAC final : public MessageAuthenticationCode
    {
    public:
       void clear() override;