diff --git a/NetSSL_OpenSSL/Makefile b/NetSSL_OpenSSL/Makefile
index 0912ac58d..51176b76b 100644
--- a/NetSSL_OpenSSL/Makefile
+++ b/NetSSL_OpenSSL/Makefile
@@ -11,8 +11,8 @@ include $(POCO_BASE)/build/rules/global
 SYSLIBS += -lssl -lcrypto
 
 objects = AcceptCertificateHandler RejectCertificateHandler ConsoleCertificateHandler \
-	CertificateHandlerFactory CertificateHandlerFactoryMgr \
-	Context HTTPSClientSession HTTPSStreamFactory HTTPSSessionInstantiator \
+	CertificateHandlerFactory CertificateHandlerFactoryMgr Context \
+	HTTPSClient HTTPSClientSession HTTPSStreamFactory HTTPSSessionInstantiator \
 	InvalidCertificateHandler KeyConsoleHandler \
 	KeyFileHandler PrivateKeyFactory PrivateKeyFactoryMgr \
 	PrivateKeyPassphraseHandler SecureServerSocket SecureServerSocketImpl \
diff --git a/NetSSL_OpenSSL/testsuite/Makefile b/NetSSL_OpenSSL/testsuite/Makefile
index 496d15aae..0251a24d5 100644
--- a/NetSSL_OpenSSL/testsuite/Makefile
+++ b/NetSSL_OpenSSL/testsuite/Makefile
@@ -16,8 +16,9 @@ SYSLIBS += -lssl -lcrypto -lz -ldl
 endif
 
 objects = NetSSLTestSuite Driver \
-	HTTPSClientSessionTest HTTPSClientTestSuite HTTPSServerTest HTTPSServerTestSuite \
-	HTTPSStreamFactoryTest HTTPSTestServer TCPServerTest TCPServerTestSuite
+	HTTPSClientTest HTTPSClientSessionTest HTTPSClientTestSuite HTTPSServerTest \
+	HTTPSServerTestSuite HTTPSStreamFactoryTest HTTPSTestServer \
+	TCPServerTest TCPServerTestSuite
 
 target         = testrunner
 target_version = 1