diff --git a/include/proto/backend.h b/include/proto/backend.h
index 5f24be6..cc25a6f 100644
--- a/include/proto/backend.h
+++ b/include/proto/backend.h
@@ -22,6 +22,7 @@
 #ifndef _PROTO_BACKEND_H
 #define _PROTO_BACKEND_H
 
+#include <common/config.h>
 
 #include <types/backend.h>
 #include <types/session.h>
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index b332a4b..29a2abc 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_BUFFERS_H
 #define _PROTO_BUFFERS_H
 
-#include <common/defaults.h>
+#include <common/config.h>
 #include <types/buffers.h>
 
 /* returns 1 if the buffer is empty, 0 otherwise */
diff --git a/include/proto/checks.h b/include/proto/checks.h
index d16a288..6ac32a1 100644
--- a/include/proto/checks.h
+++ b/include/proto/checks.h
@@ -23,6 +23,7 @@
 #define _PROTO_CHECKS_H
 
 #include <types/task.h>
+#include <common/config.h>
 
 int process_chk(struct task *t);
 
diff --git a/include/proto/client.h b/include/proto/client.h
index e119dca..3065b61 100644
--- a/include/proto/client.h
+++ b/include/proto/client.h
@@ -22,9 +22,9 @@
 #ifndef _PROTO_CLIENT_H
 #define _PROTO_CLIENT_H
 
+#include <common/config.h>
 #include <types/client.h>
 
-
 int event_accept(int fd);
 
 
diff --git a/include/proto/fd.h b/include/proto/fd.h
index 699047b..879205b 100644
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <common/config.h>
 #include <types/fd.h>
 
 /* Deletes an FD from the fdsets, and recomputes the maxfd limit.
diff --git a/include/proto/log.h b/include/proto/log.h
index 5cc568a..7a74c82 100644
--- a/include/proto/log.h
+++ b/include/proto/log.h
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <syslog.h>
 
+#include <common/config.h>
 #include <types/log.h>
 #include <types/proxy.h>
 #include <types/session.h>
diff --git a/include/proto/polling.h b/include/proto/polling.h
index 6b349c6..179c654 100644
--- a/include/proto/polling.h
+++ b/include/proto/polling.h
@@ -22,6 +22,7 @@
 #ifndef _PROTO_POLLING_H
 #define _PROTO_POLLING_H
 
+#include <common/config.h>
 #include <types/polling.h>
 
 /*
diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index e9cd4f3..205b0ee 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -22,6 +22,7 @@
 #ifndef _PROTO_PROTO_HTTP_H
 #define _PROTO_PROTO_HTTP_H
 
+#include <common/config.h>
 #include <types/proto_http.h>
 #include <types/session.h>
 #include <types/task.h>
diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index 4a3d67c..968495f 100644
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_PROXY_H
 #define _PROTO_PROXY_H
 
-
+#include <common/config.h>
 #include <types/proxy.h>
 
 int start_proxies(int verbose);
diff --git a/include/proto/queue.h b/include/proto/queue.h
index 6909cbe..6732ba9 100644
--- a/include/proto/queue.h
+++ b/include/proto/queue.h
@@ -22,6 +22,7 @@
 #ifndef _PROTO_QUEUE_H
 #define _PROTO_QUEUE_H
 
+#include <common/config.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 
diff --git a/include/proto/server.h b/include/proto/server.h
index b79b970..2df0763 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -24,6 +24,7 @@
 
 #include <unistd.h>
 
+#include <common/config.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
diff --git a/include/proto/session.h b/include/proto/session.h
index 6c84f4c..e3e5234 100644
--- a/include/proto/session.h
+++ b/include/proto/session.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_SESSION_H
 #define _PROTO_SESSION_H
 
-
+#include <common/config.h>
 #include <types/session.h>
 
 void session_free(struct session *s);
diff --git a/include/proto/stream_sock.h b/include/proto/stream_sock.h
index 14d90cf..31184b1 100644
--- a/include/proto/stream_sock.h
+++ b/include/proto/stream_sock.h
@@ -26,7 +26,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <common/defaults.h>
 #include <common/config.h>
 
 
diff --git a/include/proto/task.h b/include/proto/task.h
index 72fd1f1..70abb82 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -24,8 +24,10 @@
 
 
 #include <sys/time.h>
-#include <types/task.h>
+
+#include <common/config.h>
 #include <common/memory.h>
+#include <types/task.h>
 
 
 /* puts the task <t> in run queue <q>, and returns <t> */
diff --git a/include/proto/template.h b/include/proto/template.h
index 868634f..f7f9e55 100644
--- a/include/proto/template.h
+++ b/include/proto/template.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_TEMPLATE_H
 #define _PROTO_TEMPLATE_H
 
-
+#include <common/config.h>
 #include <types/template.h>