Clean out unused dependencies from CConnection.h

common/rfb/CConnection.cxx

@@ -17,17 +17,22 @@
  */
 #include <stdio.h>
 #include <string.h>
+
 #include <rfb/Exception.h>
 #include <rfb/fenceTypes.h>
 #include <rfb/CMsgReader.h>
 #include <rfb/CMsgWriter.h>
 #include <rfb/CSecurity.h>
 #include <rfb/Security.h>
+#include <rfb/SecurityClient.h>
 #include <rfb/CConnection.h>
 #include <rfb/util.h>
 
 #include <rfb/LogWriter.h>
 
+#include <rdr/InStream.h>
+#include <rdr/OutStream.h>
+
 using namespace rfb;
 
 static LogWriter vlog("CConnection");

common/rfb/CConnection.h

@@ -23,12 +23,8 @@
 #ifndef __RFB_CCONNECTION_H__
 #define __RFB_CCONNECTION_H__
 
-#include <rdr/InStream.h>
-#include <rdr/OutStream.h>
 #include <rfb/CMsgHandler.h>
-#include <rfb/CSecurity.h>
 #include <rfb/util.h>
-#include <rfb/SecurityClient.h>
 
 namespace rfb {
 
@@ -36,6 +32,7 @@ namespace rfb {
   class CMsgWriter;
   class CSecurity;
   class IdentityVerifier;
+  class SecurityClient;
 
   class CConnection : public CMsgHandler {
   public:

common/rfb/CSecurityPlain.cxx

@@ -22,6 +22,8 @@
 #include <rfb/UserPasswdGetter.h>
 #include <rfb/util.h>
 
+#include <rdr/OutStream.h>
+
 using namespace rfb;
 
 bool CSecurityPlain::processMsg(CConnection* cc)

common/rfb/CSecurityVncAuth.cxx

@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <stdio.h>
+
 #include <rfb/CConnection.h>
 #include <rfb/Password.h>
 #include <rfb/CSecurityVncAuth.h>
@@ -32,6 +33,8 @@ extern "C" {
 #include <rfb/d3des.h>
 }
 
+#include <rdr/InStream.h>
+#include <rdr/OutStream.h>
 
 using namespace rfb;
 

vncviewer/CConn.cxx

@@ -28,10 +28,12 @@
 #endif
 
 #include <rfb/CMsgWriter.h>
+#include <rfb/CSecurity.h>
 #include <rfb/encodings.h>
 #include <rfb/Decoder.h>
 #include <rfb/Hostname.h>
 #include <rfb/LogWriter.h>
+#include <rfb/Security.h>
 #include <rfb/util.h>
 #include <rfb/screenTypes.h>
 #include <rfb/fenceTypes.h>