diff --git a/alsapid/alsapid.h b/alsapid/alsapid.h
index 9920c038..5d1b24d6 100644
--- a/alsapid/alsapid.h
+++ b/alsapid/alsapid.h
@@ -32,6 +32,8 @@
 #include <stdbool.h>            /* C99 bool */
 #include <stdlib.h>             /* pid_t */
 
+#include <unistd.h> // for pid_t
+
 void alsapid_compose_src_link(int alsa_client_id, char * buffer);
 void alsapid_compose_dst_link(char * buffer);
 bool alsapid_get_pid(int alsa_client_id, pid_t * pid_ptr);
diff --git a/alsapid/helper.c b/alsapid/helper.c
index ab209d9d..861dc787 100644
--- a/alsapid/helper.c
+++ b/alsapid/helper.c
@@ -33,6 +33,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include <libgen.h>
+
 void alsapid_compose_src_link(int alsa_client_id, char * buffer)
 {
   sprintf(buffer, "/tmp/alsapid-%lld-%d", (long long)getuid(), alsa_client_id);
diff --git a/daemon/app_supervisor.c b/daemon/app_supervisor.c
index 9fcf3d87..ac378f63 100644
--- a/daemon/app_supervisor.c
+++ b/daemon/app_supervisor.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <unistd.h>
+#include <sys/wait.h>
 
 #include "app_supervisor.h"
 #include "../dbus_constants.h"
diff --git a/daemon/loader.c b/daemon/loader.c
index 9cb1dc05..ba569971 100644
--- a/daemon/loader.c
+++ b/daemon/loader.c
@@ -30,10 +30,18 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <pty.h>                /* forkpty() */
+#if !defined(__FreeBSD__)
+#  include <pty.h>                /* forkpty() */
+#else
+#  include <sys/types.h>
+#  include <sys/ioctl.h>
+#  include <termios.h>
+#  include <libutil.h>
+#endif
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <signal.h>
 
 #include "loader.h"
 #include "../proxies/conf_proxy.h"
diff --git a/proxies/graph_proxy.h b/proxies/graph_proxy.h
index 57729cd7..b539b88c 100644
--- a/proxies/graph_proxy.h
+++ b/proxies/graph_proxy.h
@@ -28,6 +28,7 @@
 #define GRAPH_PROXY_H__61D1ED56_E33B_4F50_B45B_F520979E8AA7__INCLUDED
 
 #include "common.h"
+#include <unistd.h>
 
 typedef struct graph_proxy_tag { int unused; } * graph_proxy_handle;