GUAC-730: Fix headers for telnet.

src/protocols/telnet/client.c

@@ -32,7 +32,6 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>

src/protocols/telnet/clipboard.c

@@ -25,6 +25,9 @@
 #include "clipboard.h"
 #include "terminal.h"
 
+#include <guacamole/client.h>
+#include <guacamole/stream.h>
+
 int guac_telnet_clipboard_handler(guac_client* client, guac_stream* stream,
         char* mimetype) {
 

src/protocols/telnet/guac_handlers.c

@@ -26,17 +26,13 @@
 #include "terminal.h"
 #include "telnet_client.h"
 
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-#include <sys/stat.h>
-
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
 #include <guacamole/client.h>
 #include <libtelnet.h>
 
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 int guac_telnet_client_handle_messages(guac_client* client) {
 
     guac_telnet_client_data* client_data = (guac_telnet_client_data*) client->data;

src/protocols/telnet/telnet_client.c

@@ -22,10 +22,13 @@
 
 #include "config.h"
 #include "client.h"
-#include "guac_handlers.h"
 #include "telnet_client.h"
 #include "terminal.h"
 
+#include <guacamole/client.h>
+#include <guacamole/protocol.h>
+#include <libtelnet.h>
+
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -33,14 +36,9 @@
 #include <string.h>
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/types.h>
+#include <sys/time.h>
 #include <unistd.h>
 
-#include <guacamole/client.h>
-#include <guacamole/protocol.h>
-#include <guacamole/socket.h>
-#include <libtelnet.h>
-
 /**
  * Support levels for various telnet options, required for connection
  * negotiation by telnet_init(), part of libtelnet.

src/protocols/telnet/telnet_client.h

@@ -25,7 +25,9 @@
 
 #include "config.h"
 
-#include <guacamole/client.h>
+#include <libtelnet.h>
+
+#include <stdint.h>
 
 /**
  * Main telnet client thread, handling transfer of telnet output to STDOUT.