3 files changed, 11 insertions, 8 deletions
diff --git a/src/lib/pubkey/rfc6979/info.txt b/src/lib/pubkey/rfc6979/info.txt
index 72a61301c..53f0ad72c 100644
--- a/src/lib/pubkey/rfc6979/info.txt
+++ b/src/lib/pubkey/rfc6979/info.txt
@@ -6,3 +6,7 @@ RFC6979_GENERATOR -> 20140321
 bigint
 hmac_drbg
 </requires>
+
+<header:internal>
+rfc6979.h
+</header:internal>
diff --git a/src/lib/pubkey/rfc6979/rfc6979.cpp b/src/lib/pubkey/rfc6979/rfc6979.cpp
index 94b313c3a..3a67e6951 100644
--- a/src/lib/pubkey/rfc6979/rfc6979.cpp
+++ b/src/lib/pubkey/rfc6979/rfc6979.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/rfc6979.h>
+#include <botan/internal/rfc6979.h>
 #include <botan/hmac_drbg.h>
 #include <botan/mac.h>
 
diff --git a/src/lib/pubkey/rfc6979/rfc6979.h b/src/lib/pubkey/rfc6979/rfc6979.h
index 54134a682..c1b1d2cc7 100644
--- a/src/lib/pubkey/rfc6979/rfc6979.h
+++ b/src/lib/pubkey/rfc6979/rfc6979.h
@@ -12,13 +12,11 @@
 #include <string>
 #include <memory>
 
-BOTAN_FUTURE_INTERNAL_HEADER(rfc6979.h)
-
 namespace Botan {
 
 class HMAC_DRBG;
 
-class BOTAN_PUBLIC_API(2,0) RFC6979_Nonce_Generator final
+class BOTAN_TEST_API RFC6979_Nonce_Generator final
    {
    public:
       /**
@@ -45,10 +43,11 @@ class BOTAN_PUBLIC_API(2,0) RFC6979_Nonce_Generator final
 * @param h the message hash already reduced mod q
 * @param hash the hash function used to generate h
 */
-BigInt BOTAN_PUBLIC_API(2,0) generate_rfc6979_nonce(const BigInt& x,
-                                        const BigInt& q,
-                                        const BigInt& h,
-                                        const std::string& hash);
+BOTAN_TEST_API
+BigInt generate_rfc6979_nonce(const BigInt& x,
+                              const BigInt& q,
+                              const BigInt& h,
+                              const std::string& hash);
 
 }