diff --git a/src/terminal/cursor.h b/src/terminal/cursor.h
index cfe5c036..ffa5ca8f 100644
--- a/src/terminal/cursor.h
+++ b/src/terminal/cursor.h
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <guacamole/client.h>
+#include <guacamole/layer.h>
 
 typedef struct guac_terminal_cursor {
 
diff --git a/src/terminal/display.c b/src/terminal/display.c
index 43aba25f..9d7792bb 100644
--- a/src/terminal/display.c
+++ b/src/terminal/display.c
@@ -32,6 +32,8 @@
 #include <string.h>
 #include <wchar.h>
 
+#include <cairo/cairo.h>
+#include <glib-object.h>
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
diff --git a/src/terminal/display.h b/src/terminal/display.h
index 387deb21..e7b21f57 100644
--- a/src/terminal/display.h
+++ b/src/terminal/display.h
@@ -25,13 +25,16 @@
 #define _GUAC_TERMINAL_DISPLAY_H
 
 #include "config.h"
-#include "guac_surface.h"
 
+#include "guac_surface.h"
 #include "types.h"
 
 #include <guacamole/client.h>
+#include <guacamole/layer.h>
 #include <pango/pangocairo.h>
 
+#include <stdbool.h>
+
 /**
  * The maximum width of any character, in columns.
  */
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index 295b8eb5..735eb9df 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -35,18 +35,18 @@
 
 #include <pthread.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/select.h>
+#include <sys/time.h>
 #include <unistd.h>
 #include <wchar.h>
 
-#include <cairo/cairo.h>
 #include <guacamole/client.h>
 #include <guacamole/error.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
-#include <pango/pangocairo.h>
 
 /**
  * Sets the given range of columns to the given character.
diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h
index 552bbcc9..0c530988 100644
--- a/src/terminal/terminal.h
+++ b/src/terminal/terminal.h
@@ -36,6 +36,7 @@
 #include <stdbool.h>
 
 #include <guacamole/client.h>
+#include <guacamole/stream.h>
 
 /**
  * The maximum number of custom tab stops.
diff --git a/src/terminal/terminal_handlers.c b/src/terminal/terminal_handlers.c
index 4d795f4d..ba80f129 100644
--- a/src/terminal/terminal_handlers.c
+++ b/src/terminal/terminal_handlers.c
@@ -23,10 +23,13 @@
 #include "config.h"
 
 #include "char_mappings.h"
-#include "common.h"
 #include "terminal.h"
 #include "terminal_handlers.h"
+#include "types.h"
 
+#include <guacamole/client.h>
+
+#include <stdbool.h>
 #include <stdlib.h>
 #include <wchar.h>