4 files changed, 26 insertions, 9 deletions
diff --git a/common/rfb/CSecurityRSAAES.h b/common/rfb/CSecurityRSAAES.h
index 35b0513b..e5548c1d 100644
--- a/common/rfb/CSecurityRSAAES.h
+++ b/common/rfb/CSecurityRSAAES.h
@@ -25,12 +25,17 @@
 #endif
 
 #include <nettle/rsa.h>
+
 #include <rfb/CSecurity.h>
 #include <rfb/Security.h>
-#include <rdr/InStream.h>
-#include <rdr/OutStream.h>
+
 #include <rdr/RandomStream.h>
 
+namespace rdr {
+  class InStream;
+  class OutStream;
+}
+
 namespace rfb {
   class CSecurityRSAAES : public CSecurity {
   public:
diff --git a/common/rfb/CSecurityTLS.h b/common/rfb/CSecurityTLS.h
index 848ef9bb..5091682b 100644
--- a/common/rfb/CSecurityTLS.h
+++ b/common/rfb/CSecurityTLS.h
@@ -28,10 +28,14 @@
 
 #include <rfb/CSecurity.h>
 #include <rfb/Security.h>
-#include <rdr/InStream.h>
-#include <rdr/OutStream.h>
+
 #include <gnutls/gnutls.h>
 
+namespace rdr {
+  class InStream;
+  class OutStream;
+}
+
 namespace rfb {
   class CSecurityTLS : public CSecurity {
   public:
diff --git a/common/rfb/SSecurityRSAAES.h b/common/rfb/SSecurityRSAAES.h
index edac35c6..a6fbc499 100644
--- a/common/rfb/SSecurityRSAAES.h
+++ b/common/rfb/SSecurityRSAAES.h
@@ -24,11 +24,16 @@
 #endif
 
 #include <nettle/rsa.h>
+
 #include <rfb/SSecurity.h>
-#include <rdr/InStream.h>
-#include <rdr/OutStream.h>
+
 #include <rdr/RandomStream.h>
 
+namespace rdr {
+  class InStream;
+  class OutStream;
+}
+
 namespace rfb {
 
   class SSecurityRSAAES : public SSecurity {
diff --git a/common/rfb/SSecurityTLS.h b/common/rfb/SSecurityTLS.h
index c29ee474..8f6539d9 100644
--- a/common/rfb/SSecurityTLS.h
+++ b/common/rfb/SSecurityTLS.h
@@ -27,9 +27,7 @@
 #endif
 
 #include <rfb/SSecurity.h>
-#include <rfb/SSecurityVeNCrypt.h>
-#include <rdr/InStream.h>
-#include <rdr/OutStream.h>
+
 #include <gnutls/gnutls.h>
 
 /* In GnuTLS 3.6.0 DH parameter generation was deprecated. RFC7919 is used instead.
@@ -39,6 +37,11 @@
 #define SSECURITYTLS__USE_DEPRECATED_DH
 #endif
 
+namespace rdr {
+  class InStream;
+  class OutStream;
+}
+
 namespace rfb {
 
   class SSecurityTLS : public SSecurity {