diff --git a/polyp/authkey.c b/polyp/authkey.c
index bbc45c378..9b60506ff 100644
--- a/polyp/authkey.c
+++ b/polyp/authkey.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <limits.h>
+#include <sys/stat.h>
 
 #include "authkey.h"
 #include "util.h"
diff --git a/polyp/main.c b/polyp/main.c
index 2a45ad37c..0e55528df 100644
--- a/polyp/main.c
+++ b/polyp/main.c
@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) {
             pa_log_set_target(PA_LOG_SYSLOG, NULL);
 
         setsid();
-        setpgrp();
+        setpgid(0,0);
         
         close(0);
         close(1);
diff --git a/polyp/module-protocol-stub.c b/polyp/module-protocol-stub.c
index 46522d9b5..17c491dea 100644
--- a/polyp/module-protocol-stub.c
+++ b/polyp/module-protocol-stub.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <arpa/inet.h>
 #include <unistd.h>
+#include <netinet/in.h>
 
 #include "module.h"
 #include "socket-server.h"
diff --git a/polyp/namereg.c b/polyp/namereg.c
index 5791a3e45..e2f65efd3 100644
--- a/polyp/namereg.c
+++ b/polyp/namereg.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <assert.h>
 #include <string.h>
-#include <malloc.h>
 #include <stdio.h>
 
 #include "namereg.h"
diff --git a/polyp/pstream.c b/polyp/pstream.c
index b0de9e8c6..5fe2b4e75 100644
--- a/polyp/pstream.c
+++ b/polyp/pstream.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <unistd.h>
 #include <netinet/in.h>
 
 #include "pstream.h"
diff --git a/polyp/tagstruct.c b/polyp/tagstruct.c
index 39ae87b53..bbebdab34 100644
--- a/polyp/tagstruct.c
+++ b/polyp/tagstruct.c
@@ -25,6 +25,8 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <assert.h>
 
diff --git a/polyp/util.c b/polyp/util.c
index cc132dbb1..7148654a2 100644
--- a/polyp/util.c
+++ b/polyp/util.c
@@ -33,6 +33,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <pwd.h>
 #include <signal.h>
 #include <pthread.h>