diff --git a/hashfwd.h b/hashfwd.h
index 8e11013a..49c2b02a 100644
--- a/hashfwd.h
+++ b/hashfwd.h
@@ -20,6 +20,9 @@ class SHA3_256;
 class SHA3_384;
 class SHA3_512;
 
+class SHAKE128;
+class SHAKE256;
+
 class Tiger;
 class RIPEMD128;
 class RIPEMD160;
diff --git a/keccak.h b/keccak.h
index bbc357b0..75410ba7 100644
--- a/keccak.h
+++ b/keccak.h
@@ -88,6 +88,8 @@ public:
     ///   block size called rate expressed as <tt>r</tt>.
     unsigned int BlockSize() const { return BLOCKSIZE; }
 
+    std::string AlgorithmName() const { return StaticAlgorithmName(); }
+
 private:
 #if !defined(__BORLANDC__)
     // ensure there was no underflow in the math
diff --git a/sha3.h b/sha3.h
index 34de9c78..ea412166 100644
--- a/sha3.h
+++ b/sha3.h
@@ -13,6 +13,7 @@
 
 #include "cryptlib.h"
 #include "secblock.h"
+#include "misc.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 
@@ -75,6 +76,8 @@ public:
     ///   block size called rate expressed as <tt>r</tt>.
     unsigned int BlockSize() const { return BLOCKSIZE; }
 
+    std::string AlgorithmName() const { return StaticAlgorithmName(); }
+
 private:
 #if !defined(__BORLANDC__)
     // ensure there was no underflow in the math
diff --git a/shake.h b/shake.h
index 409779f5..e775710c 100644
--- a/shake.h
+++ b/shake.h
@@ -82,6 +82,8 @@ public:
     ///   to block size called rate expressed as <tt>r</tt>.
     unsigned int BlockSize() const { return BLOCKSIZE; }
 
+    std::string AlgorithmName() const { return StaticAlgorithmName(); }
+
 private:
 #if !defined(__BORLANDC__)
     // ensure there was no underflow in the math