diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 8cfc2b2..785d305 100644
--- a/common/rfb/CConnection.cxx
+++ b/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");
diff --git a/common/rfb/CConnection.h b/common/rfb/CConnection.h
index b767ede..501c761 100644
--- a/common/rfb/CConnection.h
+++ b/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 @@
   class CMsgWriter;
   class CSecurity;
   class IdentityVerifier;
+  class SecurityClient;
 
   class CConnection : public CMsgHandler {
   public:
diff --git a/common/rfb/CSecurityPlain.cxx b/common/rfb/CSecurityPlain.cxx
index 8aec0de..0320ce2 100644
--- a/common/rfb/CSecurityPlain.cxx
+++ b/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)
diff --git a/common/rfb/CSecurityVncAuth.cxx b/common/rfb/CSecurityVncAuth.cxx
index 5b53c60..f44e56e 100644
--- a/common/rfb/CSecurityVncAuth.cxx
+++ b/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 @@
 #include <rfb/d3des.h>
 }
 
+#include <rdr/InStream.h>
+#include <rdr/OutStream.h>
 
 using namespace rfb;
 
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index 686ce30..9c12796 100644
--- a/vncviewer/CConn.cxx
+++ b/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>