diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index 35294e78..042fed06 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -34,12 +34,6 @@
 #include "rdp_stream.h"
 #include "rdp_svc.h"
 
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-
 #include <freerdp/cache/bitmap.h>
 #include <freerdp/cache/brush.h>
 #include <freerdp/cache/glyph.h>
@@ -47,12 +41,9 @@
 #include <freerdp/cache/palette.h>
 #include <freerdp/cache/pointer.h>
 #include <freerdp/channels/channels.h>
-#include <freerdp/constants.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/input.h>
 #include <guacamole/audio.h>
 #include <guacamole/client.h>
-#include <guacamole/error.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
@@ -76,6 +67,11 @@
 #include <freerdp/client/channels.h>
 #endif
 
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 /* Client plugin arguments */
 const char* GUAC_CLIENT_ARGS[] = {
     "hostname",
diff --git a/src/protocols/rdp/client.h b/src/protocols/rdp/client.h
index 97a053ba..b6a82f2e 100644
--- a/src/protocols/rdp/client.h
+++ b/src/protocols/rdp/client.h
@@ -33,15 +33,14 @@
 #include "rdp_keymap.h"
 #include "rdp_settings.h"
 
-#include <pthread.h>
-#include <stdint.h>
-
-#include <cairo/cairo.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/codec/color.h>
 #include <guacamole/audio.h>
 #include <guacamole/client.h>
 
+#include <pthread.h>
+#include <stdint.h>
+
 /**
  * The maximum duration of a frame in milliseconds.
  */
diff --git a/src/protocols/rdp/compat/winpr-stream.c b/src/protocols/rdp/compat/winpr-stream.c
index 5d604822..2a3154fc 100644
--- a/src/protocols/rdp/compat/winpr-stream.c
+++ b/src/protocols/rdp/compat/winpr-stream.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "winpr-stream.h"
+#include "winpr-wtypes.h"
 
 /*
  * NOTE: Because the old API did not support local allocation of the buffer
diff --git a/src/protocols/rdp/compat/winpr-stream.h b/src/protocols/rdp/compat/winpr-stream.h
index 321e6053..d4e16013 100644
--- a/src/protocols/rdp/compat/winpr-stream.h
+++ b/src/protocols/rdp/compat/winpr-stream.h
@@ -30,6 +30,8 @@
 
 #include <freerdp/utils/stream.h>
 
+#include <stddef.h>
+
 /* FreeRDP 1.0 streams */
 
 #define Stream_Write                   stream_write
diff --git a/src/protocols/rdp/guac_handlers.c b/src/protocols/rdp/guac_handlers.c
index f9c61ddf..26ef46cb 100644
--- a/src/protocols/rdp/guac_handlers.c
+++ b/src/protocols/rdp/guac_handlers.c
@@ -23,20 +23,16 @@
 #include "config.h"
 
 #include "client.h"
+#include "guac_clipboard.h"
 #include "guac_handlers.h"
 #include "guac_list.h"
 #include "guac_surface.h"
 #include "rdp_cliprdr.h"
 #include "rdp_keymap.h"
+#include "rdp_fs.h"
 #include "rdp_rail.h"
 #include "rdp_stream.h"
 
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-
 #include <freerdp/cache/cache.h>
 #include <freerdp/channels/channels.h>
 #include <freerdp/codec/color.h>
@@ -46,24 +42,19 @@
 #include <guacamole/client.h>
 #include <guacamole/error.h>
 #include <guacamole/protocol.h>
-#include <guacamole/socket.h>
 #include <guacamole/timestamp.h>
 
-#ifdef ENABLE_WINPR
-#include <winpr/wtypes.h>
-#else
-#include "compat/winpr-wtypes.h"
-#endif
-
 #ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
 #include <freerdp/client/cliprdr.h>
 #else
 #include "compat/client-cliprdr.h"
 #endif
 
-#ifdef LEGACY_FREERDP
-#include "compat/rail.h"
-#endif
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include <sys/time.h>
 
 void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to);
 int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed);
diff --git a/src/protocols/rdp/guac_handlers.h b/src/protocols/rdp/guac_handlers.h
index 582fcaad..0eaf80c3 100644
--- a/src/protocols/rdp/guac_handlers.h
+++ b/src/protocols/rdp/guac_handlers.h
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <guacamole/client.h>
-#include <guacamole/stream.h>
 
 int rdp_guac_client_free_handler(guac_client* client);
 int rdp_guac_client_handle_messages(guac_client* client);
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c
index 90c63c84..5689d2ec 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "debug.h"
 #include "rdpdr_fs_messages_dir_info.h"
 #include "rdpdr_fs_messages_file_info.h"
@@ -34,18 +33,22 @@
 #include "rdp_status.h"
 #include "unicode.h"
 
-#include <inttypes.h>
-#include <errno.h>
-
 #include <freerdp/utils/svc_plugin.h>
-#include <guacamole/pool.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
+#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
+#include "compat/winpr-wtypes.h"
 #endif
 
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
 void guac_rdpdr_fs_process_create(guac_rdpdr_device* device,
         wStream* input_stream, int completion_id) {
 
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h
index a208634a..592e4ee1 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h
@@ -36,8 +36,6 @@
 
 #include "rdpdr_service.h"
 
-#include <guacamole/pool.h>
-
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
 #else
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c
index 5a562131..9c34e67c 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c
@@ -23,12 +23,12 @@
 #include "config.h"
 
 #include "debug.h"
-#include "rdpdr_messages.h"
 #include "rdpdr_service.h"
 #include "rdp_fs.h"
 #include "rdp_status.h"
 #include "unicode.h"
 
+#include <freerdp/utils/svc_plugin.h>
 #include <guacamole/unicode.h>
 
 #ifdef ENABLE_WINPR
@@ -37,6 +37,8 @@
 #include "compat/winpr-stream.h"
 #endif
 
+#include <stddef.h>
+
 void guac_rdpdr_fs_process_query_directory_info(guac_rdpdr_device* device,
         const char* entry_name, int file_id, int completion_id) {
 
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
index 9970ebbe..0f95be52 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
@@ -22,25 +22,26 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "debug.h"
-#include "rdpdr_messages.h"
 #include "rdpdr_service.h"
 #include "rdp_fs.h"
 #include "rdp_status.h"
 #include "unicode.h"
 
-#include <inttypes.h>
-
 #include <freerdp/utils/svc_plugin.h>
-#include <guacamole/pool.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
+#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
+#include "compat/winpr-wtypes.h"
 #endif
 
+#include <inttypes.h>
+#include <stdint.h>
+#include <string.h>
+
 void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream* input_stream,
         int file_id, int completion_id) {
 
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c
index aa450122..c89d180e 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c
@@ -22,21 +22,20 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "debug.h"
 #include "rdpdr_messages.h"
 #include "rdpdr_service.h"
 #include "rdp_fs.h"
 #include "rdp_status.h"
-#include "unicode.h"
 
 #include <freerdp/utils/svc_plugin.h>
-#include <guacamole/pool.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
+#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
+#include "compat/winpr-wtypes.h"
 #endif
 
 void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device,
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c
index 745d8919..c2f3657c 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c
@@ -27,11 +27,9 @@
 #include "rdpdr_fs_messages.h"
 #include "rdpdr_messages.h"
 #include "rdpdr_service.h"
-#include "rdp_fs.h"
-#include "unicode.h"
 
 #include <freerdp/utils/svc_plugin.h>
-#include <guacamole/pool.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c b/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
index fa579d7f..dc08929a 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
@@ -22,27 +22,21 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "rdpdr_messages.h"
-#include "rdpdr_printer.h"
 #include "rdpdr_service.h"
 
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <freerdp/constants.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
-#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
-#include "compat/winpr-wtypes.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 static void guac_rdpdr_send_client_announce_reply(guac_rdpdrPlugin* rdpdr,
         unsigned int major, unsigned int minor, unsigned int client_id) {
 
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_messages.h b/src/protocols/rdp/guac_rdpdr/rdpdr_messages.h
index 35618525..d4b0b999 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_messages.h
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_messages.h
@@ -34,6 +34,8 @@
 #include "compat/winpr-stream.h"
 #endif
 
+#include <stdint.h>
+
 /**
  * Identifies the "core" component of RDPDR as the destination of the received
  * packet.
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c b/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
index b08dcaaf..df631f6a 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
@@ -22,16 +22,13 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "rdpdr_messages.h"
 #include "rdpdr_printer.h"
 #include "rdpdr_service.h"
 #include "rdp_status.h"
 
-#include <errno.h>
-#include <unistd.h>
-
 #include <freerdp/utils/svc_plugin.h>
+#include <guacamole/client.h>
 #include <guacamole/protocol.h>
 
 #ifdef ENABLE_WINPR
@@ -40,6 +37,11 @@
 #include "compat/winpr-stream.h"
 #endif
 
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 /* Command to run GhostScript safely as a filter writing PDF */
 char* const guac_rdpdr_pdf_filter_command[] = {
     "gs",
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_printer.h b/src/protocols/rdp/guac_rdpdr/rdpdr_printer.h
index 29c4e319..529033df 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_printer.h
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_printer.h
@@ -26,7 +26,9 @@
 
 #include "config.h"
 
-#include <freerdp/utils/svc_plugin.h>
+#include "rdpdr_service.h"
+
+#include <guacamole/stream.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -34,6 +36,8 @@
 #include "compat/winpr-stream.h"
 #endif
 
+#include <pthread.h>
+
 /**
  * Data specific to an instance of the printer device.
  */
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_service.c b/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
index 9e8cf4bf..77d1ee06 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
@@ -24,6 +24,8 @@
 
 #include "client.h"
 #include "debug.h"
+#include "rdp_fs.h"
+#include "rdp_settings.h"
 #include "rdp_stream.h"
 #include "rdpdr_fs_service.h"
 #include "rdpdr_messages.h"
@@ -42,10 +44,8 @@
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
-#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
-#include "compat/winpr-wtypes.h"
 #endif
 
 /**
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_service.h b/src/protocols/rdp/guac_rdpdr/rdpdr_service.h
index f2a002a5..58cad9aa 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_service.h
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_service.h
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <pthread.h>
-
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/client.h>
 
diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c b/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c
index 200ceec3..6b821f91 100644
--- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c
+++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c
@@ -28,9 +28,7 @@
 
 #include <pthread.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include <freerdp/constants.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/audio.h>
 #include <guacamole/client.h>
diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h b/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h
index 14697aa5..82339d09 100644
--- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h
+++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h
@@ -30,6 +30,12 @@
 
 #include <guacamole/audio.h>
 
+#ifdef ENABLE_WINPR
+#include <winpr/stream.h>
+#else
+#include "compat/winpr-stream.h"
+#endif
+
 /*
  * PDU Message Types
  */
diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
index 6d6f727f..45aee99f 100644
--- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
+++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
@@ -29,17 +29,14 @@
 #include <string.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/types.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/audio.h>
 #include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
-#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
-#include "compat/winpr-wtypes.h"
 #endif
 
 /**
diff --git a/src/protocols/rdp/guac_svc/svc_service.c b/src/protocols/rdp/guac_svc/svc_service.c
index ba77ad1a..ee24b59d 100644
--- a/src/protocols/rdp/guac_svc/svc_service.c
+++ b/src/protocols/rdp/guac_svc/svc_service.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include "client.h"
-#include "debug.h"
 #include "svc_service.h"
 
 #include <stdlib.h>
@@ -37,10 +35,8 @@
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
-#include <winpr/wtypes.h>
 #else
 #include "compat/winpr-stream.h"
-#include "compat/winpr-wtypes.h"
 #endif
 
 /**
diff --git a/src/protocols/rdp/guac_svc/svc_service.h b/src/protocols/rdp/guac_svc/svc_service.h
index a35cd058..bb509acd 100644
--- a/src/protocols/rdp/guac_svc/svc_service.h
+++ b/src/protocols/rdp/guac_svc/svc_service.h
@@ -26,10 +26,7 @@
 #include "config.h"
 #include "rdp_svc.h"
 
-#include <pthread.h>
-
 #include <freerdp/utils/svc_plugin.h>
-#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
diff --git a/src/protocols/rdp/rdp_bitmap.c b/src/protocols/rdp/rdp_bitmap.c
index daa4d451..2b2502c2 100644
--- a/src/protocols/rdp/rdp_bitmap.c
+++ b/src/protocols/rdp/rdp_bitmap.c
@@ -25,17 +25,13 @@
 #include "client.h"
 #include "guac_surface.h"
 #include "rdp_bitmap.h"
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "rdp_settings.h"
 
 #include <cairo/cairo.h>
 #include <freerdp/codec/bitmap.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/freerdp.h>
 #include <guacamole/client.h>
-#include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
 #ifdef ENABLE_WINPR
@@ -44,6 +40,9 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+
 void guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) {
 
     guac_client* client = ((rdp_freerdp_context*) context)->client;
diff --git a/src/protocols/rdp/rdp_bitmap.h b/src/protocols/rdp/rdp_bitmap.h
index 95ae90cc..cab99a33 100644
--- a/src/protocols/rdp/rdp_bitmap.h
+++ b/src/protocols/rdp/rdp_bitmap.h
@@ -28,7 +28,7 @@
 #include "guac_surface.h"
 
 #include <freerdp/freerdp.h>
-#include <guacamole/protocol.h>
+#include <guacamole/layer.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
diff --git a/src/protocols/rdp/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c
index 9e885ee9..6dfdfd42 100644
--- a/src/protocols/rdp/rdp_cliprdr.c
+++ b/src/protocols/rdp/rdp_cliprdr.c
@@ -24,13 +24,13 @@
 
 #include "client.h"
 #include "rdp_cliprdr.h"
+#include "guac_clipboard.h"
 #include "guac_iconv.h"
 
 #include <freerdp/channels/channels.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/event.h>
 #include <guacamole/client.h>
-#include <guacamole/protocol.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -44,6 +44,9 @@
 #include "compat/client-cliprdr.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event) {
 
 #ifdef LEGACY_EVENT
diff --git a/src/protocols/rdp/rdp_cliprdr.h b/src/protocols/rdp/rdp_cliprdr.h
index 08b0b102..e8ed53f9 100644
--- a/src/protocols/rdp/rdp_cliprdr.h
+++ b/src/protocols/rdp/rdp_cliprdr.h
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <freerdp/freerdp.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
diff --git a/src/protocols/rdp/rdp_fs.c b/src/protocols/rdp/rdp_fs.c
index 369c9b14..72112af9 100644
--- a/src/protocols/rdp/rdp_fs.c
+++ b/src/protocols/rdp/rdp_fs.c
@@ -25,17 +25,16 @@
 #include "debug.h"
 #include "rdp_fs.h"
 #include "rdp_status.h"
-#include "unicode.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include <guacamole/pool.h>
diff --git a/src/protocols/rdp/rdp_fs.h b/src/protocols/rdp/rdp_fs.h
index cf422d91..643f4539 100644
--- a/src/protocols/rdp/rdp_fs.h
+++ b/src/protocols/rdp/rdp_fs.h
@@ -37,11 +37,10 @@
 
 #include "config.h"
 
+#include <guacamole/pool.h>
+
 #include <dirent.h>
 #include <stdint.h>
-#include <sys/types.h>
-
-#include <guacamole/pool.h>
 
 /**
  * The maximum number of file IDs to provide.
diff --git a/src/protocols/rdp/rdp_gdi.c b/src/protocols/rdp/rdp_gdi.c
index 11b0d6e5..724f9fac 100644
--- a/src/protocols/rdp/rdp_gdi.c
+++ b/src/protocols/rdp/rdp_gdi.c
@@ -25,10 +25,12 @@
 #include "client.h"
 #include "guac_surface.h"
 #include "rdp_bitmap.h"
+#include "rdp_settings.h"
 
-#include <pthread.h>
+#include <cairo/cairo.h>
 #include <freerdp/freerdp.h>
 #include <guacamole/client.h>
+#include <guacamole/protocol.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -36,6 +38,8 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
+#include <stddef.h>
+
 guac_transfer_function guac_rdp_rop3_transfer_function(guac_client* client,
         int rop3) {
 
diff --git a/src/protocols/rdp/rdp_glyph.c b/src/protocols/rdp/rdp_glyph.c
index 09b480dc..621251a5 100644
--- a/src/protocols/rdp/rdp_glyph.c
+++ b/src/protocols/rdp/rdp_glyph.c
@@ -25,12 +25,10 @@
 #include "client.h"
 #include "guac_surface.h"
 #include "rdp_glyph.h"
-
-#include <pthread.h>
+#include "rdp_settings.h"
 
 #include <freerdp/freerdp.h>
 #include <guacamole/client.h>
-#include <guacamole/error.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
@@ -38,6 +36,10 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
+#include <pthread.h>
+#include <stdint.h>
+#include <stdlib.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)
diff --git a/src/protocols/rdp/rdp_glyph.h b/src/protocols/rdp/rdp_glyph.h
index f8ac313b..b7a7f153 100644
--- a/src/protocols/rdp/rdp_glyph.h
+++ b/src/protocols/rdp/rdp_glyph.h
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include <cairo/cairo.h>
 #include <freerdp/freerdp.h>
 
 #ifdef ENABLE_WINPR
@@ -34,8 +35,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#include <guacamole/protocol.h>
-
 typedef struct guac_rdp_glyph {
 
     /**
diff --git a/src/protocols/rdp/rdp_keymap.c b/src/protocols/rdp/rdp_keymap.c
index c01216eb..63dc3a88 100644
--- a/src/protocols/rdp/rdp_keymap.c
+++ b/src/protocols/rdp/rdp_keymap.c
@@ -24,6 +24,8 @@
 
 #include "rdp_keymap.h"
 
+#include <string.h>
+
 const int GUAC_KEYSYMS_SHIFT[] = {0xFFE1, 0};
 const int GUAC_KEYSYMS_ALL_SHIFT[] = {0xFFE1, 0xFFE2, 0};
 
diff --git a/src/protocols/rdp/rdp_keymap.h b/src/protocols/rdp/rdp_keymap.h
index 4d4cf167..52840e11 100644
--- a/src/protocols/rdp/rdp_keymap.h
+++ b/src/protocols/rdp/rdp_keymap.h
@@ -32,12 +32,6 @@
 #include "compat/winpr-wtypes.h"
 #endif
 
-#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
-#include <freerdp/locale/keyboard.h>
-#else
-#include <freerdp/kbd/layouts.h>
-#endif
-
 /**
  * Represents a keysym-to-scancode mapping for RDP, with extra information
  * about the state of prerequisite keysyms.
diff --git a/src/protocols/rdp/rdp_pointer.c b/src/protocols/rdp/rdp_pointer.c
index 4ef36e35..5f9c977d 100644
--- a/src/protocols/rdp/rdp_pointer.c
+++ b/src/protocols/rdp/rdp_pointer.c
@@ -25,10 +25,13 @@
 #include "client.h"
 #include "rdp_pointer.h"
 
-#include <pthread.h>
-
+#include <cairo/cairo.h>
 #include <freerdp/freerdp.h>
 #include <guacamole/client.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
+
+#include <stdlib.h>
 
 void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer) {
 
diff --git a/src/protocols/rdp/rdp_pointer.h b/src/protocols/rdp/rdp_pointer.h
index 3c35ddfc..f488e486 100644
--- a/src/protocols/rdp/rdp_pointer.h
+++ b/src/protocols/rdp/rdp_pointer.h
@@ -27,8 +27,7 @@
 #include "config.h"
 
 #include <freerdp/freerdp.h>
-
-#include <guacamole/protocol.h>
+#include <guacamole/layer.h>
 
 typedef struct guac_rdp_pointer {
 
diff --git a/src/protocols/rdp/rdp_rail.c b/src/protocols/rdp/rdp_rail.c
index ccdf3d13..4368238d 100644
--- a/src/protocols/rdp/rdp_rail.c
+++ b/src/protocols/rdp/rdp_rail.c
@@ -24,6 +24,7 @@
 
 #include "client.h"
 #include "rdp_rail.h"
+#include "rdp_settings.h"
 
 #include <freerdp/channels/channels.h>
 #include <freerdp/freerdp.h>
@@ -38,9 +39,11 @@
 
 #ifdef LEGACY_FREERDP
 #include "compat/rail.h"
+#else
+#include <freerdp/rail.h>
 #endif
 
-#include <freerdp/rail.h>
+#include <stddef.h>
 
 void guac_rdp_process_rail_event(guac_client* client, wMessage* event) {
 
diff --git a/src/protocols/rdp/rdp_rail.h b/src/protocols/rdp/rdp_rail.h
index 3264b095..9eadf470 100644
--- a/src/protocols/rdp/rdp_rail.h
+++ b/src/protocols/rdp/rdp_rail.h
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <freerdp/freerdp.h>
+#include <guacamole/client.h>
 
 #ifdef ENABLE_WINPR
 #include <winpr/stream.h>
@@ -34,8 +34,6 @@
 #include "compat/winpr-stream.h"
 #endif
 
-#include <freerdp/rail.h>
-
 /**
  * Dispatches a given RAIL event to the appropriate handler.
  */
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index ad5ab15d..d00da5e2 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -26,6 +26,14 @@
 
 #include <freerdp/constants.h>
 
+#ifdef ENABLE_WINPR
+#include <winpr/wtypes.h>
+#else
+#include "compat/winpr-wtypes.h"
+#endif
+
+#include <stddef.h>
+
 void guac_rdp_pull_settings(freerdp* rdp, guac_rdp_settings* guac_settings) {
 
     rdpSettings* rdp_settings = rdp->settings;
diff --git a/src/protocols/rdp/rdp_settings.h b/src/protocols/rdp/rdp_settings.h
index c203a6de..f1fda0a2 100644
--- a/src/protocols/rdp/rdp_settings.h
+++ b/src/protocols/rdp/rdp_settings.h
@@ -29,7 +29,6 @@
 #include "rdp_keymap.h"
 
 #include <freerdp/freerdp.h>
-#include <guacamole/client.h>
 
 /**
  * The default RDP port.
diff --git a/src/protocols/rdp/rdp_stream.c b/src/protocols/rdp/rdp_stream.c
index 480d70f7..f3e30fc0 100644
--- a/src/protocols/rdp/rdp_stream.c
+++ b/src/protocols/rdp/rdp_stream.c
@@ -23,13 +23,14 @@
 
 #include "config.h"
 #include "client.h"
+#include "guac_clipboard.h"
 #include "rdp_fs.h"
 #include "rdp_svc.h"
 #include "rdp_stream.h"
 
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/channels.h>
 #include <guacamole/client.h>
-#include <guacamole/error.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 #include <guacamole/stream.h>
@@ -41,11 +42,15 @@
 #endif
 
 #ifdef ENABLE_WINPR
+#include <winpr/stream.h>
 #include <winpr/wtypes.h>
 #else
+#include "compat/winpr-stream.h"
 #include "compat/winpr-wtypes.h"
 #endif
 
+#include <stdlib.h>
+
 /**
  * Writes the given filename to the given upload path, sanitizing the filename
  * and translating the filename to the root directory.
diff --git a/src/protocols/rdp/rdp_stream.h b/src/protocols/rdp/rdp_stream.h
index 978f8ae1..3ae0d9bb 100644
--- a/src/protocols/rdp/rdp_stream.h
+++ b/src/protocols/rdp/rdp_stream.h
@@ -27,6 +27,10 @@
 #include "config.h"
 #include "rdp_svc.h"
 
+#include <guacamole/client.h>
+#include <guacamole/protocol.h>
+#include <guacamole/stream.h>
+
 #include <stdint.h>
 
 /**
diff --git a/src/protocols/rdp/rdp_svc.c b/src/protocols/rdp/rdp_svc.c
index 3921e21f..dab956a5 100644
--- a/src/protocols/rdp/rdp_svc.c
+++ b/src/protocols/rdp/rdp_svc.c
@@ -25,7 +25,6 @@
 #include "guac_list.h"
 #include "rdp_svc.h"
 
-#include <freerdp/freerdp.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/client.h>
 
@@ -35,6 +34,9 @@
 #include "compat/winpr-stream.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 guac_rdp_svc* guac_rdp_alloc_svc(guac_client* client, char* name) {
 
     guac_rdp_svc* svc = malloc(sizeof(guac_rdp_svc));
diff --git a/src/protocols/rdp/rdp_svc.h b/src/protocols/rdp/rdp_svc.h
index c0ddf404..7b6e5910 100644
--- a/src/protocols/rdp/rdp_svc.h
+++ b/src/protocols/rdp/rdp_svc.h
@@ -25,15 +25,9 @@
 
 #include "config.h"
 
-#include <freerdp/freerdp.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <guacamole/client.h>
-
-#ifdef ENABLE_WINPR
-#include <winpr/stream.h>
-#else
-#include "compat/winpr-stream.h"
-#endif
+#include <guacamole/stream.h>
 
 /**
  * The maximum number of characters to allow for each channel name.