diff --git a/src/common/guac_dot_cursor.c b/src/common/guac_dot_cursor.c
index da062987..a08022e2 100644
--- a/src/common/guac_dot_cursor.c
+++ b/src/common/guac_dot_cursor.c
@@ -24,6 +24,7 @@
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
+#include <guacamole/layer.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
diff --git a/src/common/guac_pointer_cursor.c b/src/common/guac_pointer_cursor.c
index 3a87378f..c09968bd 100644
--- a/src/common/guac_pointer_cursor.c
+++ b/src/common/guac_pointer_cursor.c
@@ -24,6 +24,7 @@
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>
+#include <guacamole/layer.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
diff --git a/src/common/guac_surface.c b/src/common/guac_surface.c
index 51e1a77d..3dd8a754 100644
--- a/src/common/guac_surface.c
+++ b/src/common/guac_surface.c
@@ -31,8 +31,6 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
-
 
 /**
  * The width of an update which should be considered negible and thus
diff --git a/src/common/guac_surface.h b/src/common/guac_surface.h
index 63bfd784..7d921ca9 100644
--- a/src/common/guac_surface.h
+++ b/src/common/guac_surface.h
@@ -31,8 +31,6 @@
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
 
-#include <stdint.h>
-
 /**
  * The maximum number of updates to allow within the PNG queue.
  */