diff --git a/src/protocols/ssh/client.c b/src/protocols/ssh/client.c
index f370b5d1..eb538aef 100644
--- a/src/protocols/ssh/client.c
+++ b/src/protocols/ssh/client.c
@@ -33,7 +33,6 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
diff --git a/src/protocols/ssh/client.h b/src/protocols/ssh/client.h
index 4022f486..9675860c 100644
--- a/src/protocols/ssh/client.h
+++ b/src/protocols/ssh/client.h
@@ -30,8 +30,6 @@
 #include "ssh_key.h"
 #include "terminal.h"
 
-#include <pthread.h>
-
 #include <libssh2.h>
 #include <libssh2_sftp.h>
 
@@ -39,6 +37,9 @@
 #include "ssh_agent.h"
 #endif
 
+#include <pthread.h>
+#include <stdbool.h>
+
 /**
  * SSH-specific client data.
  */
diff --git a/src/protocols/ssh/clipboard.c b/src/protocols/ssh/clipboard.c
index 5ec732db..34a86fe7 100644
--- a/src/protocols/ssh/clipboard.c
+++ b/src/protocols/ssh/clipboard.c
@@ -23,6 +23,10 @@
 #include "config.h"
 #include "client.h"
 #include "clipboard.h"
+#include "terminal.h"
+
+#include <guacamole/client.h>
+#include <guacamole/stream.h>
 
 int guac_ssh_clipboard_handler(guac_client* client, guac_stream* stream,
         char* mimetype) {
diff --git a/src/protocols/ssh/guac_handlers.c b/src/protocols/ssh/guac_handlers.c
index 13aadeae..efe74e17 100644
--- a/src/protocols/ssh/guac_handlers.c
+++ b/src/protocols/ssh/guac_handlers.c
@@ -24,20 +24,16 @@
 
 #include "client.h"
 #include "guac_handlers.h"
+#include "ssh_key.h"
 #include "terminal.h"
 
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-#include <sys/stat.h>
-
 #include <cairo/cairo.h>
-#include <guacamole/socket.h>
-#include <guacamole/protocol.h>
 #include <guacamole/client.h>
 #include <libssh2.h>
-#include <pango/pangocairo.h>
+#include <libssh2_sftp.h>
+
+#include <pthread.h>
+#include <stdlib.h>
 
 int ssh_guac_client_handle_messages(guac_client* client) {
 
diff --git a/src/protocols/ssh/sftp.c b/src/protocols/ssh/sftp.c
index 18c3b407..dacc94d4 100644
--- a/src/protocols/ssh/sftp.c
+++ b/src/protocols/ssh/sftp.c
@@ -23,15 +23,14 @@
 #include "config.h"
 
 #include "client.h"
+#include "sftp.h"
 
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdbool.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
-#include <libssh2.h>
+#include <libssh2_sftp.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
diff --git a/src/protocols/ssh/sftp.h b/src/protocols/ssh/sftp.h
index 884214a3..0564bf2d 100644
--- a/src/protocols/ssh/sftp.h
+++ b/src/protocols/ssh/sftp.h
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <guacamole/client.h>
+#include <guacamole/protocol.h>
 #include <guacamole/stream.h>
 
 /**
diff --git a/src/protocols/ssh/ssh_agent.c b/src/protocols/ssh/ssh_agent.c
index 48397ea9..8c54f57b 100644
--- a/src/protocols/ssh/ssh_agent.c
+++ b/src/protocols/ssh/ssh_agent.c
@@ -26,10 +26,6 @@
 #include "ssh_agent.h"
 #include "ssh_buffer.h"
 
-#include <stdio.h>
-#include <stdint.h>
-#include <unistd.h>
-
 #include <guacamole/client.h>
 #include <libssh2.h>
 #include <openssl/err.h>
@@ -37,6 +33,11 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 void ssh_auth_agent_sign(ssh_auth_agent* agent, char* data, int data_length) {
 
     LIBSSH2_CHANNEL* channel = agent->channel;
diff --git a/src/protocols/ssh/ssh_buffer.c b/src/protocols/ssh/ssh_buffer.c
index 64f8de24..4d4d852a 100644
--- a/src/protocols/ssh/ssh_buffer.c
+++ b/src/protocols/ssh/ssh_buffer.c
@@ -22,10 +22,12 @@
 
 #include "config.h"
 
+#include <openssl/bn.h>
+#include <openssl/ossl_typ.h>
+
 #include <stdint.h>
 #include <string.h>
-
-#include <openssl/bn.h>
+#include <stdlib.h>
 
 void buffer_write_byte(char** buffer, uint8_t value) {
 
diff --git a/src/protocols/ssh/ssh_client.c b/src/protocols/ssh/ssh_client.c
index 4845ce56..71552bf4 100644
--- a/src/protocols/ssh/ssh_client.c
+++ b/src/protocols/ssh/ssh_client.c
@@ -23,30 +23,33 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_handlers.h"
 #include "sftp.h"
 #include "ssh_key.h"
+#include "terminal.h"
 
-#include <errno.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <unistd.h>
+#ifdef ENABLE_SSH_AGENT
+#include "ssh_agent.h"
+#endif
 
 #include <libssh2.h>
+#include <libssh2_sftp.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 #include <openssl/ssl.h>
 
-#ifdef ENABLE_SSH_AGENT
-#include "ssh_agent.h"
-#endif
+#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/time.h>
 
 void* ssh_input_thread(void* data) {
 
diff --git a/src/protocols/ssh/ssh_key.c b/src/protocols/ssh/ssh_key.c
index ddaa7f78..0097f980 100644
--- a/src/protocols/ssh/ssh_key.c
+++ b/src/protocols/ssh/ssh_key.c
@@ -25,13 +25,17 @@
 #include "ssh_buffer.h"
 #include "ssh_key.h"
 
-#include <string.h>
-
-#include <openssl/err.h>
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
 #include <openssl/evp.h>
+#include <openssl/obj_mac.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 
+#include <stdlib.h>
+#include <string.h>
+
 ssh_key* ssh_key_alloc(char* data, int length, char* passphrase) {
 
     ssh_key* key;
diff --git a/src/protocols/ssh/ssh_key.h b/src/protocols/ssh/ssh_key.h
index 0aed7efa..6291aa11 100644
--- a/src/protocols/ssh/ssh_key.h
+++ b/src/protocols/ssh/ssh_key.h
@@ -26,11 +26,7 @@
 
 #include "config.h"
 
-#include <openssl/dsa.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
+#include <openssl/ossl_typ.h>
 
 /**
  * The expected header of RSA private keys.