CLEANUP: includes: fix includes for a number of users of fd.h

It appears that fd.h includes a number of unneeded files and was
included from standard.h, and as such served as an intermediary
to provide almost everything to everyone.

By removing its useless includes, a long dependency chain broke
but could easily be fixed.

diff --git a/include/common/standard.h b/include/common/standard.h
index e7c5ebd9a88978bbd1d750e7e2e68c12534a9169..511a1dd3b07b75b7c8e92cd46af99ee0e437cc20 100644 (file)
--- 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 43f02d726752aaa598d95ad36c17855b0b252379..3ed605ff0eceb56a4658c3be7a82d400a93df02c 100644 (file)
--- 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 ef43ef9baa2132e66939b29ff0ce0f9dbd90af4c..6556446ad3c8a3e2ec4999e15a7355bb484bd562 100644 (file)
--- 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 1ccb0ebede9c132e5919ce741008e5bd3d924be9..1c443298eb5a9a0e9b5211dddfd5b1fc50c1164d 100644 (file)
--- 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 2f5ce86d5fdc8d46a055ee2ed69fe18fb94cc293..bc1aad29a9ae793ca994a85fdc540649f7232e5f 100644 (file)
--- 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 */

diff --git a/src/connection.c b/src/connection.c
index cb314add48bae3bc189ba92b08dc35d6a6cfca99..748e14e9cb893d1c27c5e15f6c888a2a2413cb05 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -14,6 +14,7 @@
 #include <common/config.h>
 
 #include <proto/connection.h>
+#include <proto/fd.h>
 #include <proto/proto_tcp.h>
 #include <proto/session.h>
 #include <proto/stream_interface.h>

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 37731445629f4911764b858334d33c64c80bbc7b..b43731cb91369fe2b2bdd902a4a459f6edcb0639 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -41,6 +41,7 @@
 #include <proto/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
+#include <proto/fd.h>
 #include <proto/log.h>
 #include <proto/port_range.h>
 #include <proto/protocols.h>

diff --git a/src/sample.c b/src/sample.c
index aec94fe2a37eadc56a53ee6834261780b0024a7a..3703a44b46cc8285d6724665977738fda9db3384 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -13,6 +13,7 @@
 
 #include <string.h>
 #include <arpa/inet.h>
+#include <stdio.h>
 
 #include <common/chunk.h>
 #include <common/standard.h>

diff --git a/src/session.c b/src/session.c
index c4323da126409de735642458b42ae1801cef9a1e..3c47937d4153f5d583570d8b8ce3ceb40445b595 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -28,6 +28,7 @@
 #include <proto/checks.h>
 #include <proto/connection.h>
 #include <proto/dumpstats.h>
+#include <proto/fd.h>
 #include <proto/freq_ctr.h>
 #include <proto/frontend.h>
 #include <proto/hdr_idx.h>

diff --git a/src/standard.c b/src/standard.c
index 0af7c9595ea6fea49371b9280c76e4db188a617e..e7bc070008e043366e636fe929c8cae40c449771 100644 (file)
--- a/src/standard.c
+++ b/src/standard.c
@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <netdb.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>