diff --git a/Crypto/Makefile b/Crypto/Makefile
index 26ed5ea8d..3e654d1b1 100644
--- a/Crypto/Makefile
+++ b/Crypto/Makefile
@@ -8,7 +8,9 @@ include $(POCO_BASE)/build/rules/global
 
 SYSLIBS += -lssl -lcrypto
 
-objects = Cipher CipherFactory CipherImpl CipherKey CipherKeyImpl CryptoStream CryptoTransform \
+objects = Cipher CipherFactory CipherImpl CipherKey CipherKeyImpl \
+	CryptoException CryptoStream CryptoTransform ECDSADigestEngine \
+	ECKey ECKeyImpl EVPPKey KeyPair KeyPairImpl PKCS12Container \
 	RSACipherImpl RSAKey RSAKeyImpl RSADigestEngine DigestEngine \
 	X509Certificate OpenSSLInitializer
 
diff --git a/Crypto/include/Poco/Crypto/EVPPKey.h b/Crypto/include/Poco/Crypto/EVPPKey.h
index b4538fc57..c82e178d3 100644
--- a/Crypto/include/Poco/Crypto/EVPPKey.h
+++ b/Crypto/include/Poco/Crypto/EVPPKey.h
@@ -27,6 +27,7 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <sstream>
+#include <typeinfo>
 
 
 namespace Poco {
@@ -146,8 +147,8 @@ private:
 		const std::string& keyFile,
 		const std::string& pass = "")
 	{
-		poco_assert_dbg (((typeid(K) == typeid(RSA) || typeid(K) == typeid(EC_KEY)) && getFunc) ||
-						((typeid(K) == typeid(EVP_PKEY)) && !getFunc));
+		poco_assert_dbg (((typeid(K*) == typeid(RSA*) || typeid(K*) == typeid(EC_KEY*)) && getFunc) ||
+						((typeid(K*) == typeid(EVP_PKEY*)) && !getFunc));
 		poco_check_ptr (ppKey);
 		poco_assert_dbg (!*ppKey);
 
@@ -192,8 +193,8 @@ private:
 		std::istream* pIstr,
 		const std::string& pass = "")
 	{
-		poco_assert_dbg (((typeid(K) == typeid(RSA) || typeid(K) == typeid(EC_KEY)) && getFunc) ||
-						((typeid(K) == typeid(EVP_PKEY)) && !getFunc));
+		poco_assert_dbg (((typeid(K*) == typeid(RSA*) || typeid(K*) == typeid(EC_KEY*)) && getFunc) ||
+						((typeid(K*) == typeid(EVP_PKEY*)) && !getFunc));
 		poco_check_ptr(ppKey);
 		poco_assert_dbg(!*ppKey);
 
diff --git a/Crypto/testsuite/src/EVPTest.cpp b/Crypto/testsuite/src/EVPTest.cpp
index 527ac2644..e2582c298 100644
--- a/Crypto/testsuite/src/EVPTest.cpp
+++ b/Crypto/testsuite/src/EVPTest.cpp
@@ -18,6 +18,8 @@
 #include "CppUnit/TestSuite.h"
 #include <sstream>
 #include <fstream>
+#include <iostream>
+#include <cstring>
 
 
 using namespace Poco::Crypto;
@@ -126,7 +128,7 @@ void EVPTest::testRSAEVPPKey()
 		assert (sizePub1 && (sizePub1 == sizePub2));
 		assert (0 == memcmp(pPubData1, pPubData2, sizePub1));
 
-#endif POCO_ENABLE_CPP11
+#endif // POCO_ENABLE_CPP11
 
 		BIO_free(bioPub2);
 		BIO_free(bioPriv2);
@@ -269,7 +271,7 @@ void EVPTest::testECEVPPKey()
 		assert (0 == memcmp(pPrivData1, pPrivData2, sizePriv1));
 		assert (sizePub1 && (sizePub1 == sizePub2));
 		assert (0 == memcmp(pPubData1, pPubData2, sizePub1));
-#endif POCO_ENABLE_CPP11
+#endif // POCO_ENABLE_CPP11
 
 		BIO_free(bioPub2);
 		BIO_free(bioPriv2);