diff --git a/dll.cpp b/dll.cpp
index 5a3f7996..d47a3189 100644
--- a/dll.cpp
+++ b/dll.cpp
@@ -7,6 +7,7 @@
 #include "config.h"
 #include "iterhash.h"
 #include "pkcspad.h"
+#include "emsa2.h"
 
 // Cast from FARPROC to funcptr with args, http://stackoverflow.com/q/4192058/608639
 #pragma warning(disable: 4191)
diff --git a/hashfwd.h b/hashfwd.h
index 00fc86b4..8e11013a 100644
--- a/hashfwd.h
+++ b/hashfwd.h
@@ -16,7 +16,6 @@ class SHA256;
 class SHA384;
 class SHA512;
 
-// http://github.com/weidai11/cryptopp/issues/517
 class SHA3_256;
 class SHA3_384;
 class SHA3_512;
@@ -24,6 +23,7 @@ class SHA3_512;
 class Tiger;
 class RIPEMD128;
 class RIPEMD160;
+class Whirlpool;
 
 namespace Weak1 {
   class MD2;