diff --git a/protocols/vnc/configure.in b/protocols/vnc/configure.in
index 8cb63fab..fbf4509a 100644
--- a/protocols/vnc/configure.in
+++ b/protocols/vnc/configure.in
@@ -48,7 +48,7 @@ AC_CHECK_LIB([cairo], [cairo_create],, AC_MSG_ERROR("cairo is required for drawi
 AC_CHECK_LIB([vncclient], [rfbInitClient],, AC_MSG_ERROR("libvncclient is required"))
 
 # Checks for header files.
-AC_CHECK_HEADERS([stdlib.h string.h syslog.h guacamole/client.h guacamole/guacio.h guacamole/protocol.h])
+AC_CHECK_HEADERS([stdlib.h string.h syslog.h guacamole/client.h guacamole/socket.h guacamole/protocol.h])
 
 # Checks for library functions.
 AC_FUNC_MALLOC
diff --git a/protocols/vnc/include/guac_handlers.h b/protocols/vnc/include/guac_handlers.h
index 90ed4c1c..766d9d64 100644
--- a/protocols/vnc/include/guac_handlers.h
+++ b/protocols/vnc/include/guac_handlers.h
@@ -38,16 +38,6 @@
 #ifndef __GUAC_VNC_GUAC_HANDLERS_H
 #define __GUAC_VNC_GUAC_HANDLERS_H
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <syslog.h>
-
-#include <rfb/rfbclient.h>
-
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
 #include <guacamole/client.h>
 
 int vnc_guac_client_handle_messages(guac_client* client);
diff --git a/protocols/vnc/include/vnc_handlers.h b/protocols/vnc/include/vnc_handlers.h
index 87dd8824..c325e5ab 100644
--- a/protocols/vnc/include/vnc_handlers.h
+++ b/protocols/vnc/include/vnc_handlers.h
@@ -35,20 +35,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <syslog.h>
-
-#include <cairo/cairo.h>
+#ifndef __GUAC_VNC_VNC_HANDLERS_H
+#define __GUAC_VNC_VNC_HANDLERS_H
 
 #include <rfb/rfbclient.h>
 
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
-#include <guacamole/client.h>
-
 void guac_vnc_cursor(rfbClient* client, int x, int y, int w, int h, int bpp);
 void guac_vnc_update(rfbClient* client, int x, int y, int w, int h);
 void guac_vnc_copyrect(rfbClient* client, int src_x, int src_y, int w, int h, int dest_x, int dest_y);
@@ -58,3 +49,5 @@ void guac_vnc_cut_text(rfbClient* client, const char* text, int textlen);
 void guac_vnc_client_log_info(const char* format, ...);
 void guac_vnc_client_log_error(const char* format, ...);
 
+#endif
+
diff --git a/protocols/vnc/src/client.c b/protocols/vnc/src/client.c
index 9e0755f3..8ed6a9f0 100644
--- a/protocols/vnc/src/client.c
+++ b/protocols/vnc/src/client.c
@@ -36,10 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <time.h>
-#include <syslog.h>
 
 #include <rfb/rfbclient.h>
 
diff --git a/protocols/vnc/src/guac_handlers.c b/protocols/vnc/src/guac_handlers.c
index a7c2704b..d0b314a7 100644
--- a/protocols/vnc/src/guac_handlers.c
+++ b/protocols/vnc/src/guac_handlers.c
@@ -36,15 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <syslog.h>
 
 #include <rfb/rfbclient.h>
 
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
 #include <guacamole/client.h>
 
 #include "client.h"
diff --git a/protocols/vnc/src/vnc_handlers.c b/protocols/vnc/src/vnc_handlers.c
index b40046ed..57ca9c3a 100644
--- a/protocols/vnc/src/vnc_handlers.c
+++ b/protocols/vnc/src/vnc_handlers.c
@@ -36,8 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <syslog.h>