GUACAMOLE-623: Add missin includes. Remove unnecessary includes.

src/protocols/kubernetes/client.c

@@ -17,22 +17,21 @@
  * under the License.
  */
 
-#include "config.h"
 #include "client.h"
-#include "common/recording.h"
+#include "common/clipboard.h"
 #include "kubernetes.h"
 #include "settings.h"
-#include "terminal/terminal.h"
 #include "user.h"
 
+#include <guacamole/client.h>
+#include <libwebsockets.h>
+
 #include <langinfo.h>
 #include <locale.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <guacamole/client.h>
-
 /**
  * Static reference to the guac_client associated with the active Kubernetes
  * connection. As guacd guarantees that each main client connection is

src/protocols/kubernetes/client.h

@@ -20,11 +20,7 @@
 #ifndef GUAC_KUBERNETES_CLIENT_H
 #define GUAC_KUBERNETES_CLIENT_H
 
-#include "config.h"
+#include <guacamole/client.h>
-#include "terminal/terminal.h"
-
-#include <pthread.h>
-#include <sys/types.h>
 
 /**
  * The maximum number of bytes to allow within the clipboard.

src/protocols/kubernetes/clipboard.c

@@ -17,11 +17,9 @@
  * under the License.
  */
 
-#include "config.h"
 #include "clipboard.h"
 #include "common/clipboard.h"
 #include "kubernetes.h"
-#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/stream.h>

src/protocols/kubernetes/clipboard.h

@@ -20,8 +20,6 @@
 #ifndef GUAC_KUBERNETES_CLIPBOARD_H
 #define GUAC_KUBERNETES_CLIPBOARD_H
 
-#include "config.h"
-
 #include <guacamole/user.h>
 
 /**

src/protocols/kubernetes/input.c

@@ -17,18 +17,15 @@
  * under the License.
  */
 
-#include "config.h"
 #include "common/recording.h"
-#include "kubernetes.h"
 #include "input.h"
+#include "kubernetes.h"
 #include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/user.h>
 
 #include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 int guac_kubernetes_user_mouse_handler(guac_user* user,
         int x, int y, int mask) {

src/protocols/kubernetes/input.h

@@ -20,8 +20,6 @@
 #ifndef GUAC_KUBERNETES_INPUT_H
 #define GUAC_KUBERNETES_INPUT_H
 
-#include "config.h"
-
 #include <guacamole/user.h>
 
 /**

src/protocols/kubernetes/kubernetes.c

@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "common/recording.h"
 #include "kubernetes.h"
+#include "common/recording.h"
 #include "terminal/terminal.h"
 #include "url.h"
 
@@ -27,16 +27,10 @@
 #include <guacamole/protocol.h>
 #include <libwebsockets.h>
 
-#include <errno.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <poll.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <unistd.h>
 
 /**
  * Handles data received from Kubernetes over WebSocket, decoding the channel

src/protocols/kubernetes/kubernetes.h

@@ -20,13 +20,15 @@
 #ifndef GUAC_KUBERNETES_H
 #define GUAC_KUBERNETES_H
 
-#include "config.h"
 #include "common/clipboard.h"
 #include "common/recording.h"
 #include "settings.h"
 #include "terminal/terminal.h"
 
+#include <guacamole/client.h>
 #include <libwebsockets.h>
+
+#include <pthread.h>
 #include <stdint.h>
 
 /**

src/protocols/kubernetes/pipe.c

@@ -17,12 +17,13 @@
  * under the License.
  */
 
-#include "config.h"
 #include "kubernetes.h"
-#include "pipe.h"
 #include "terminal/terminal.h"
+#include "pipe.h"
 
+#include <guacamole/client.h>
 #include <guacamole/protocol.h>
+#include <guacamole/stream-types.h>
 #include <guacamole/socket.h>
 #include <guacamole/user.h>
 

src/protocols/kubernetes/pipe.h

@@ -21,8 +21,6 @@
 #ifndef GUAC_KUBERNETES_PIPE_H
 #define GUAC_KUBERNETES_PIPE_H
 
-#include "config.h"
-
 #include <guacamole/user.h>
 
 /**

src/protocols/kubernetes/settings.c

@@ -17,16 +17,11 @@
  * under the License.
  */
 
-#include "config.h"
-
 #include "settings.h"
 
 #include <guacamole/user.h>
 
-#include <sys/types.h>
 #include <stdlib.h>
-#include <string.h>
-#include <time.h>
 
 /* Client plugin arguments */
 const char* GUAC_KUBERNETES_CLIENT_ARGS[] = {

src/protocols/kubernetes/settings.h

@@ -20,11 +20,8 @@
 #ifndef GUAC_KUBERNETES_SETTINGS_H
 #define GUAC_KUBERNETES_SETTINGS_H
 
-#include "config.h"
-
 #include <guacamole/user.h>
 
-#include <sys/types.h>
 #include <stdbool.h>
 
 /**

src/protocols/kubernetes/url.c

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-#include "config.h"
 #include "url.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 static int guac_kubernetes_is_url_safe(char c) {

src/protocols/kubernetes/url.h

@@ -20,8 +20,6 @@
 #ifndef GUAC_KUBERNETES_URL_H
 #define GUAC_KUBERNETES_URL_H
 
-#include "config.h"
-
 /**
  * The maximum number of characters allowed in the full path for any Kubernetes
  * endpoint.

src/protocols/kubernetes/user.c

@@ -17,9 +17,8 @@
  * under the License.
  */
 
-#include "config.h"
-
 #include "clipboard.h"
+#include "common/cursor.h"
 #include "input.h"
 #include "kubernetes.h"
 #include "pipe.h"
@@ -28,11 +27,12 @@
 #include "user.h"
 
 #include <guacamole/client.h>
+#include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 #include <guacamole/user.h>
 
 #include <pthread.h>
-#include <string.h>
+#include <stdlib.h>
 
 int guac_kubernetes_user_join_handler(guac_user* user, int argc, char** argv) {
 

src/protocols/kubernetes/user.h

@@ -20,8 +20,6 @@
 #ifndef GUAC_KUBERNETES_USER_H
 #define GUAC_KUBERNETES_USER_H
 
-#include "config.h"
-
 #include <guacamole/user.h>
 
 /**