diff --git a/config.h b/config.h
index 1dec8b4a..d21b0d4a 100644
--- a/config.h
+++ b/config.h
@@ -732,8 +732,6 @@ NAMESPACE_END
 #define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL
 #elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
 #define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
-#elif !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS)
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
 #else
 #define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL
 #endif
@@ -748,8 +746,6 @@ NAMESPACE_END
 #define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class
 #elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
 #define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
-#elif !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS)
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
 #else
 #define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class
 #endif
diff --git a/iterhash.h b/iterhash.h
index 1b3e7cb5..5ab38825 100644
--- a/iterhash.h
+++ b/iterhash.h
@@ -1,4 +1,4 @@
-// strciphr.h - originally written and placed in the public domain by Wei Dai
+// iterhash.h - originally written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_ITERHASH_H
 #define CRYPTOPP_ITERHASH_H