diff --git a/include/common/standard.h b/include/common/standard.h
index e7c5ebd..511a1dd 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
+#include <sys/un.h>
 #include <netinet/in.h>
 #include <common/config.h>
 #include <eb32tree.h>
-#include <proto/fd.h>
 
 #ifndef LLONG_MAX
 # define LLONG_MAX 9223372036854775807LL
diff --git a/include/proto/connection.h b/include/proto/connection.h
index 43f02d7..3ed605f 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -24,6 +24,7 @@
 
 #include <common/config.h>
 #include <types/connection.h>
+#include <types/protocols.h>
 
 /* I/O callback for fd-based connections. It calls the read/write handlers
  * provided by the connection's sock_ops. Returns 0.
diff --git a/include/proto/signal.h b/include/proto/signal.h
index ef43ef9..6556446 100644
--- a/include/proto/signal.h
+++ b/include/proto/signal.h
@@ -14,6 +14,7 @@
 #include <signal.h>
 #include <common/standard.h>
 #include <types/signal.h>
+#include <types/task.h>
 
 extern int signal_queue_len;
 extern struct signal_descriptor signal_state[];
diff --git a/include/types/fd.h b/include/types/fd.h
index 1ccb0eb..1c44329 100644
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -22,14 +22,8 @@
 #ifndef _TYPES_FD_H
 #define _TYPES_FD_H
 
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
 #include <common/config.h>
-#include <types/task.h>
-#include <types/protocols.h>
+#include <types/port_range.h>
 
 enum {
 	DIR_RD=0,
diff --git a/include/types/sample.h b/include/types/sample.h
index 2f5ce86..bc1aad2 100644
--- a/include/types/sample.h
+++ b/include/types/sample.h
@@ -27,6 +27,7 @@
 #include <netinet/in.h>
 
 #include <common/chunk.h>
+#include <common/mini-clist.h>
 #include <types/arg.h>
 
 /* input and output sample types */