12 files changed, 22 insertions, 16 deletions
diff --git a/cpp/src/Ice/SslCertificateDesc.cpp b/cpp/src/Ice/SslCertificateDesc.cpp
index 73e636292d4..ee62253e144 100644
--- a/cpp/src/Ice/SslCertificateDesc.cpp
+++ b/cpp/src/Ice/SslCertificateDesc.cpp
@@ -11,7 +11,6 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <openssl/ssl.h>
 #include <Ice/SslCertificateDesc.h>
 
 using namespace std;
diff --git a/cpp/src/Ice/SslConfigErrorReporter.cpp b/cpp/src/Ice/SslConfigErrorReporter.cpp
index eab3948a665..62763da2848 100644
--- a/cpp/src/Ice/SslConfigErrorReporter.cpp
+++ b/cpp/src/Ice/SslConfigErrorReporter.cpp
@@ -15,6 +15,8 @@
 #include <Ice/SslConfigErrorReporter.h>
 #include <stdlib.h>
 #include <string.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
 #include <Ice/Security.h>
 
 using namespace std;
diff --git a/cpp/src/Ice/SslConfigErrorReporter.h b/cpp/src/Ice/SslConfigErrorReporter.h
index 4de2df0e6b9..d77d375ae3d 100644
--- a/cpp/src/Ice/SslConfigErrorReporter.h
+++ b/cpp/src/Ice/SslConfigErrorReporter.h
@@ -15,8 +15,8 @@
 #include <util/XercesDefs.hpp>
 #include <dom/DOMString.hpp>
 #include <sax/ErrorHandler.hpp>
-#include <Ice/TraceLevels.h>
-#include <Ice/Logger.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
 
 namespace IceSecurity
 {
diff --git a/cpp/src/Ice/SslConnection.h b/cpp/src/Ice/SslConnection.h
index e65b297304b..3d9d5216400 100644
--- a/cpp/src/Ice/SslConnection.h
+++ b/cpp/src/Ice/SslConnection.h
@@ -12,8 +12,8 @@
 #define ICE_SSL_CONNECTION_H
 
 #include <Ice/Buffer.h>
-#include <Ice/TraceLevels.h>
-#include <Ice/Logger.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
 
 namespace IceSecurity
 {
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp
index 78c4f0ceb3c..4b20df70f60 100644
--- a/cpp/src/Ice/SslConnectionOpenSSL.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp
@@ -18,8 +18,12 @@
 #include <Ice/Security.h>
 #include <Ice/SecurityException.h>
 #include <Ice/SslConnection.h>
+#include <Ice/SslConnectionOpenSSL.h>
 #include <Ice/SslSystemOpenSSL.h>
 
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
+
 using namespace std;
 using namespace IceInternal;
 
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.h b/cpp/src/Ice/SslConnectionOpenSSL.h
index 4209723b88d..df956c789f9 100644
--- a/cpp/src/Ice/SslConnectionOpenSSL.h
+++ b/cpp/src/Ice/SslConnectionOpenSSL.h
@@ -15,9 +15,6 @@
 #include <IceUtil/Mutex.h>
 #include <Ice/SslConnection.h>
 #include <Ice/SslSystem.h>
-#include <Ice/Buffer.h>
-#include <Ice/TraceLevels.h>
-#include <Ice/Logger.h>
 
 namespace IceSecurity
 {
diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
index e13759f3fbd..88a1fc0547b 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
@@ -15,6 +15,9 @@
 #include <Ice/SecurityException.h>
 #include <Ice/SslConnectionOpenSSLClient.h>
 
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
+
 using IceSecurity::Ssl::ShutdownException;
 using namespace IceInternal;
 using namespace std;
diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.h b/cpp/src/Ice/SslConnectionOpenSSLClient.h
index 48e9b2725e6..1fe6647942d 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.h
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.h
@@ -11,8 +11,6 @@
 #ifndef ICE_SSL_CONNECTION_OPENSSL_CLIENT_H
 #define ICE_SSL_CONNECTION_OPENSSL_CLIENT_H
 
-#include <openssl/ssl.h>
-#include <Ice/Buffer.h>
 #include <Ice/SslConnectionOpenSSL.h>
 
 namespace IceSecurity
diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
index 415cdafaae1..928cee9228d 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
@@ -11,10 +11,13 @@
 #include <string>
 #include <sstream>
 #include <Ice/Network.h>
-#include <Ice/Security.h>
+// #include <Ice/Security.h>
 #include <Ice/SecurityException.h>
 #include <Ice/SslConnectionOpenSSLServer.h>
 
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
+
 using IceSecurity::Ssl::CertificateException;
 using IceSecurity::Ssl::ProtocolException;
 using namespace IceInternal;
diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.h b/cpp/src/Ice/SslConnectionOpenSSLServer.h
index 4ee9d4ecb95..7fee09b4144 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.h
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.h
@@ -11,8 +11,6 @@
 #ifndef ICE_SSL_CONNECTION_OPENSSL_SERVER_H
 #define ICE_SSL_CONNECTION_OPENSSL_SERVER_H
 
-#include <openssl/ssl.h>
-#include <Ice/Buffer.h>
 #include <Ice/SslConnectionOpenSSL.h>
 
 namespace IceSecurity
diff --git a/cpp/src/Ice/SslSystemOpenSSL.cpp b/cpp/src/Ice/SslSystemOpenSSL.cpp
index 1c6b957d517..35f6aa366ef 100644
--- a/cpp/src/Ice/SslSystemOpenSSL.cpp
+++ b/cpp/src/Ice/SslSystemOpenSSL.cpp
@@ -29,6 +29,9 @@
 #include <Ice/SslConnectionOpenSSLServer.h>
 #include <Ice/SslConfig.h>
 
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
+
 using namespace std;
 
 namespace IceSecurity
diff --git a/cpp/src/Ice/SslSystemOpenSSL.h b/cpp/src/Ice/SslSystemOpenSSL.h
index e6f574cbbed..11ae099a8cb 100644
--- a/cpp/src/Ice/SslSystemOpenSSL.h
+++ b/cpp/src/Ice/SslSystemOpenSSL.h
@@ -14,12 +14,11 @@
 #include <string>
 #include <map>
 #include <Ice/Config.h>
-#include <Ice/TraceLevels.h>
-#include <Ice/Logger.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
 #include <Ice/SslFactory.h>
 #include <Ice/SslSystem.h>
 #include <Ice/SslConnection.h>
-#include <Ice/SslConnectionOpenSSL.h>
 
 namespace IceSecurity
 {