diff --git a/src/libguac/client-handlers.c b/src/libguac/client-handlers.c
index 139362c3..22267805 100644
--- a/src/libguac/client-handlers.c
+++ b/src/libguac/client-handlers.c
@@ -25,6 +25,7 @@
 #include "client.h"
 #include "client-handlers.h"
 #include "protocol.h"
+#include "stream.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/libguac/client.c b/src/libguac/client.c
index 444e71cf..f7b3dc36 100644
--- a/src/libguac/client.c
+++ b/src/libguac/client.c
@@ -30,6 +30,7 @@
 #include "pool.h"
 #include "protocol.h"
 #include "socket.h"
+#include "stream.h"
 #include "timestamp.h"
 
 #include <stdio.h>
diff --git a/src/libguac/guacamole/client.h b/src/libguac/guacamole/client.h
index e3f936a6..3bf0dd94 100644
--- a/src/libguac/guacamole/client.h
+++ b/src/libguac/guacamole/client.h
@@ -36,7 +36,7 @@
 #include "layer-types.h"
 #include "pool-types.h"
 #include "socket-types.h"
-#include "stream.h"
+#include "stream-types.h"
 #include "timestamp-types.h"
 
 #include <stdarg.h>
diff --git a/src/protocols/rdp/guac_handlers.c b/src/protocols/rdp/guac_handlers.c
index eaf3aaca..f23ba173 100644
--- a/src/protocols/rdp/guac_handlers.c
+++ b/src/protocols/rdp/guac_handlers.c
@@ -46,6 +46,7 @@
 #include <guacamole/error.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
+#include <guacamole/timestamp.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c b/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
index 36d58d82..b08dcaaf 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
@@ -29,6 +29,7 @@
 #include "rdp_status.h"
 
 #include <errno.h>
+#include <unistd.h>
 
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/protocol.h>
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_service.c b/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
index 47891719..16c94ae3 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
@@ -36,6 +36,9 @@
 #include <freerdp/constants.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/client.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
+#include <guacamole/stream.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
diff --git a/src/protocols/rdp/guac_svc/svc_service.c b/src/protocols/rdp/guac_svc/svc_service.c
index 45c82f31..ba77ad1a 100644
--- a/src/protocols/rdp/guac_svc/svc_service.c
+++ b/src/protocols/rdp/guac_svc/svc_service.c
@@ -33,6 +33,7 @@
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
+#include <guacamole/socket.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
diff --git a/src/protocols/rdp/rdp_stream.c b/src/protocols/rdp/rdp_stream.c
index c2dd0a11..cbe05534 100644
--- a/src/protocols/rdp/rdp_stream.c
+++ b/src/protocols/rdp/rdp_stream.c
@@ -32,6 +32,7 @@
 #include <guacamole/error.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
+#include <guacamole/stream.h>
 
 #ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
 #include <freerdp/client/cliprdr.h>
diff --git a/src/protocols/ssh/display.c b/src/protocols/ssh/display.c
index 27f40e6c..d7d683da 100644
--- a/src/protocols/ssh/display.c
+++ b/src/protocols/ssh/display.c
@@ -31,6 +31,7 @@
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
+#include <guacamole/socket.h>
 
 const guac_terminal_color guac_terminal_palette[16] = {
 
diff --git a/src/protocols/ssh/sftp.c b/src/protocols/ssh/sftp.c
index ca70be87..da411fee 100644
--- a/src/protocols/ssh/sftp.c
+++ b/src/protocols/ssh/sftp.c
@@ -34,6 +34,7 @@
 #include <libssh2.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
+#include <guacamole/socket.h>
 #include <guacamole/stream.h>
 
 static bool __ssh_guac_valid_filename(char* filename) {
diff --git a/src/protocols/vnc/guac_handlers.c b/src/protocols/vnc/guac_handlers.c
index 0f639d96..234df02c 100644
--- a/src/protocols/vnc/guac_handlers.c
+++ b/src/protocols/vnc/guac_handlers.c
@@ -32,6 +32,7 @@
 #include <iconv.h>
 
 #include <guacamole/client.h>
+#include <guacamole/timestamp.h>
 #include <rfb/rfbclient.h>
 
 #ifdef ENABLE_PULSE