diff --git a/src/protocols/vnc/client.c b/src/protocols/vnc/client.c
index 090fcc84..fd9381a9 100644
--- a/src/protocols/vnc/client.c
+++ b/src/protocols/vnc/client.c
@@ -30,19 +30,19 @@
 #include "guac_pointer_cursor.h"
 #include "vnc_handlers.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#ifdef ENABLE_PULSE
+#include "pulse.h"
+#endif
 
 #include <rfb/rfbclient.h>
-#include <guacamole/audio.h>
+#include <rfb/rfbproto.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
-#ifdef ENABLE_PULSE
-#include "pulse.h"
-#endif
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
 /* Client plugin arguments */
 const char* GUAC_CLIENT_ARGS[] = {
diff --git a/src/protocols/vnc/client.h b/src/protocols/vnc/client.h
index d9971e7f..4c13b54e 100644
--- a/src/protocols/vnc/client.h
+++ b/src/protocols/vnc/client.h
@@ -29,7 +29,7 @@
 #include "guac_surface.h"
 
 #include <guacamole/audio.h>
-#include <guacamole/client.h>
+#include <guacamole/layer.h>
 #include <rfb/rfbclient.h>
 
 #ifdef ENABLE_PULSE
diff --git a/src/protocols/vnc/clipboard.c b/src/protocols/vnc/clipboard.c
index 47b36f2a..ca8fe639 100644
--- a/src/protocols/vnc/clipboard.c
+++ b/src/protocols/vnc/clipboard.c
@@ -26,6 +26,10 @@
 #include "guac_clipboard.h"
 #include "guac_iconv.h"
 
+#include <guacamole/client.h>
+#include <guacamole/stream.h>
+#include <rfb/rfbclient.h>
+
 int guac_vnc_clipboard_handler(guac_client* client, guac_stream* stream,
         char* mimetype) {
 
diff --git a/src/protocols/vnc/guac_handlers.c b/src/protocols/vnc/guac_handlers.c
index dfe921ee..a0951403 100644
--- a/src/protocols/vnc/guac_handlers.c
+++ b/src/protocols/vnc/guac_handlers.c
@@ -23,16 +23,11 @@
 #include "config.h"
 
 #include "client.h"
-#include "clipboard.h"
 #include "guac_clipboard.h"
 #include "guac_surface.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <iconv.h>
-
 #include <guacamole/client.h>
+#include <guacamole/protocol.h>
 #include <guacamole/timestamp.h>
 #include <rfb/rfbclient.h>
 
@@ -40,6 +35,8 @@
 #include "pulse.h"
 #endif
 
+#include <stdlib.h>
+
 int vnc_guac_client_handle_messages(guac_client* client) {
 
     vnc_guac_client_data* guac_client_data = (vnc_guac_client_data*) client->data;
diff --git a/src/protocols/vnc/vnc_handlers.c b/src/protocols/vnc/vnc_handlers.c
index 77c6ef50..3ff26d27 100644
--- a/src/protocols/vnc/vnc_handlers.c
+++ b/src/protocols/vnc/vnc_handlers.c
@@ -26,21 +26,24 @@
 #include "guac_iconv.h"
 #include "guac_surface.h"
 
-#include <stdlib.h>
-#include <syslog.h>
-#include <time.h>
-
 #include <cairo/cairo.h>
-#include <rfb/rfbclient.h>
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
 #include <guacamole/client.h>
+#include <guacamole/layer.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
+#include <rfb/rfbclient.h>
+#include <rfb/rfbproto.h>
 
 /* Define cairo_format_stride_for_width() if missing */
 #ifndef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
 #define cairo_format_stride_for_width(format, width) (width*4)
 #endif
 
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
+
 void guac_vnc_cursor(rfbClient* client, int x, int y, int w, int h, int bpp) {
 
     guac_client* gc = rfbClientGetClientData(client, __GUAC_CLIENT);