4 files changed, 5 insertions, 22 deletions
diff --git a/src/lib/utils/ghash/ghash.cpp b/src/lib/utils/ghash/ghash.cpp
index e24f5e02c..ccb83cc5f 100644
--- a/src/lib/utils/ghash/ghash.cpp
+++ b/src/lib/utils/ghash/ghash.cpp
@@ -6,9 +6,9 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/ghash.h>
+#include <botan/internal/ghash.h>
 #include <botan/internal/ct_utils.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/cpuid.h>
 #include <botan/exceptn.h>
 
diff --git a/src/lib/utils/ghash/ghash.h b/src/lib/utils/ghash/ghash.h
index 062a04b84..630c86b21 100644
--- a/src/lib/utils/ghash/ghash.h
+++ b/src/lib/utils/ghash/ghash.h
@@ -10,8 +10,6 @@
 
 #include <botan/sym_algo.h>
 
-BOTAN_FUTURE_INTERNAL_HEADER(ghash.h)
-
 namespace Botan {
 
 /**
@@ -19,19 +17,11 @@ namespace Botan {
 * This is not intended for general use, but is exposed to allow
 * shared code between GCM and GMAC
 */
-class BOTAN_PUBLIC_API(2,0) GHASH final : public SymmetricAlgorithm
+class GHASH final : public SymmetricAlgorithm
    {
    public:
       void set_associated_data(const uint8_t ad[], size_t ad_len);
 
-      secure_vector<uint8_t> BOTAN_DEPRECATED("Use other impl")
-         nonce_hash(const uint8_t nonce[], size_t nonce_len)
-         {
-         secure_vector<uint8_t> y0(GCM_BS);
-         nonce_hash(y0, nonce, nonce_len);
-         return y0;
-         }
-
       void nonce_hash(secure_vector<uint8_t>& y0, const uint8_t nonce[], size_t len);
 
       void start(const uint8_t nonce[], size_t len);
@@ -46,13 +36,6 @@ class BOTAN_PUBLIC_API(2,0) GHASH final : public SymmetricAlgorithm
       */
       void update_associated_data(const uint8_t ad[], size_t len);
 
-      secure_vector<uint8_t> BOTAN_DEPRECATED("Use version taking output params") final()
-         {
-         secure_vector<uint8_t> mac(GCM_BS);
-         final(mac.data(), mac.size());
-         return mac;
-         }
-
       void final(uint8_t out[], size_t out_len);
 
       Key_Length_Specification key_spec() const override
diff --git a/src/lib/utils/ghash/ghash_cpu/ghash_cpu.cpp b/src/lib/utils/ghash/ghash_cpu/ghash_cpu.cpp
index 8d9342b57..f60dfbd38 100644
--- a/src/lib/utils/ghash/ghash_cpu/ghash_cpu.cpp
+++ b/src/lib/utils/ghash/ghash_cpu/ghash_cpu.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/ghash.h>
+#include <botan/internal/ghash.h>
 #include <botan/internal/simd_32.h>
 
 #if defined(BOTAN_SIMD_USE_SSE2)
diff --git a/src/lib/utils/ghash/ghash_vperm/ghash_vperm.cpp b/src/lib/utils/ghash/ghash_vperm/ghash_vperm.cpp
index f6f342cb9..3c7dbf4d5 100644
--- a/src/lib/utils/ghash/ghash_vperm/ghash_vperm.cpp
+++ b/src/lib/utils/ghash/ghash_vperm/ghash_vperm.cpp
@@ -4,7 +4,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/ghash.h>
+#include <botan/internal/ghash.h>
 #include <immintrin.h>
 
 namespace Botan {