diff --git a/src/guacd/client.c b/src/guacd/client.c
index 53fd45d6..4291c1e0 100644
--- a/src/guacd/client.c
+++ b/src/guacd/client.c
@@ -25,10 +25,6 @@
 #include "client.h"
 #include "log.h"
 
-#include <pthread.h>
-#include <stdlib.h>
-#include <time.h>
-
 #include <guacamole/client.h>
 #include <guacamole/error.h>
 #include <guacamole/instruction.h>
@@ -36,6 +32,10 @@
 #include <guacamole/socket.h>
 #include <guacamole/timestamp.h>
 
+#include <pthread.h>
+#include <stdlib.h>
+#include <time.h>
+
 /**
  * Sleep for the given number of milliseconds.
  *
diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c
index 33e361b3..b7071aa0 100644
--- a/src/guacd/daemon.c
+++ b/src/guacd/daemon.c
@@ -25,9 +25,21 @@
 #include "client.h"
 #include "log.h"
 
-#include <ctype.h>
+#include <guacamole/client.h>
+#include <guacamole/error.h>
+#include <guacamole/instruction.h>
+#include <guacamole/plugin.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
+
+#ifdef ENABLE_SSL
+#include <openssl/ssl.h>
+#include "socket-ssl.h"
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <libgen.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -41,18 +53,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <guacamole/client.h>
-#include <guacamole/error.h>
-#include <guacamole/instruction.h>
-#include <guacamole/plugin.h>
-#include <guacamole/protocol.h>
-#include <guacamole/socket.h>
-
-#ifdef ENABLE_SSL
-#include <openssl/ssl.h>
-#include "socket-ssl.h"
-#endif
-
 #define GUACD_DEV_NULL "/dev/null"
 #define GUACD_ROOT     "/"
 
diff --git a/src/guacd/log.c b/src/guacd/log.c
index 35f6c4cd..390f327c 100644
--- a/src/guacd/log.c
+++ b/src/guacd/log.c
@@ -22,16 +22,14 @@
 
 #include "config.h"
 
-#include <errno.h>
+#include <guacamole/client.h>
+#include <guacamole/error.h>
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <syslog.h>
-#include <sys/types.h>
 #include <unistd.h>
 
-#include <guacamole/client.h>
-#include <guacamole/error.h>
-
 /* Log prefix, defaulting to "guacd" */
 char log_prefix[64] = "guacd";