REORG: include: move queue.h to haproxy/queue{,-t}.h
Nothing outstanding here. A number of call places were not justified and
removed.
diff --git a/src/backend.c b/src/backend.c
index 6e6280a..26e36ae 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -39,6 +39,7 @@
#include <haproxy/obj_type.h>
#include <haproxy/payload.h>
#include <haproxy/proxy.h>
+#include <haproxy/queue.h>
#include <haproxy/session.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stream_interface.h>
@@ -52,7 +53,6 @@
#include <haproxy/arg.h>
#include <haproxy/protocol.h>
#include <haproxy/proto_tcp.h>
-#include <proto/queue.h>
#include <haproxy/sample.h>
#include <proto/server.h>
#include <proto/stream.h>
diff --git a/src/check.c b/src/check.c
index 4e898b0..1adbf56 100644
--- a/src/check.c
+++ b/src/check.c
@@ -38,6 +38,7 @@
#include <haproxy/dns.h>
#include <haproxy/istbuf.h>
#include <haproxy/list.h>
+#include <haproxy/queue.h>
#include <haproxy/regex.h>
#include <haproxy/tools.h>
#include <haproxy/time.h>
@@ -59,7 +60,6 @@
#include <haproxy/arg.h>
#include <haproxy/fd.h>
-#include <proto/queue.h>
#include <haproxy/port_range.h>
#include <haproxy/proto_tcp.h>
#include <haproxy/protocol.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index d2aebce..a9e264f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -125,7 +125,6 @@
#include <haproxy/arg.h>
#include <haproxy/fd.h>
#include <haproxy/protocol.h>
-#include <proto/queue.h>
#include <proto/server.h>
#include <proto/stream.h>
diff --git a/src/hlua.c b/src/hlua.c
index d557777..1ab6f5a 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -54,7 +54,6 @@
#include <haproxy/vars.h>
#include <haproxy/arg.h>
-#include <proto/queue.h>
#include <proto/server.h>
#include <proto/stream.h>
diff --git a/src/lb_chash.c b/src/lb_chash.c
index 508b90c..aaaef89 100644
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -18,11 +18,11 @@
#include <haproxy/backend.h>
#include <haproxy/api.h>
+#include <haproxy/queue.h>
#include <haproxy/tools.h>
#include <import/eb32tree.h>
#include <types/server.h>
-#include <proto/queue.h>
/* Return next tree node after <node> which must still be in the tree, or be
* NULL. Lookup wraps around the end to the beginning. If the next node is the
diff --git a/src/lb_fas.c b/src/lb_fas.c
index 8967406..fc9ae51 100644
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -18,10 +18,10 @@
#include <haproxy/backend.h>
#include <haproxy/api.h>
+#include <haproxy/queue.h>
#include <import/eb32tree.h>
#include <types/server.h>
-#include <proto/queue.h>
/* Remove a server from a tree. It must have previously been dequeued. This
diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index aef9353..d7c6953 100644
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -12,10 +12,10 @@
#include <haproxy/backend.h>
#include <haproxy/api.h>
+#include <haproxy/queue.h>
#include <import/eb32tree.h>
#include <types/server.h>
-#include <proto/queue.h>
/* Remove a server from a tree. It must have previously been dequeued. This
diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index 72029a6..145d097 100644
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -12,10 +12,10 @@
#include <haproxy/backend.h>
#include <haproxy/api.h>
+#include <haproxy/queue.h>
#include <import/eb32tree.h>
#include <types/server.h>
-#include <proto/queue.h>
static inline void fwrr_remove_from_tree(struct server *s);
static inline void fwrr_queue_by_weight(struct eb_root *root, struct server *s);
diff --git a/src/lb_map.c b/src/lb_map.c
index a6d1cf8..c963180 100644
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -13,10 +13,10 @@
#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/lb_map.h>
+#include <haproxy/queue.h>
#include <import/eb32tree.h>
#include <types/server.h>
-#include <proto/queue.h>
/* this function updates the map according to server <srv>'s new state.
*
diff --git a/src/queue.c b/src/queue.c
index 9cdce01..ea0b64a 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -73,6 +73,7 @@
#include <haproxy/api.h>
#include <haproxy/http_rules.h>
#include <haproxy/pool.h>
+#include <haproxy/queue.h>
#include <haproxy/sample.h>
#include <haproxy/stream_interface.h>
#include <haproxy/task.h>
@@ -81,7 +82,6 @@
#include <haproxy/thread.h>
#include <import/eb32tree.h>
-#include <proto/queue.h>
#include <proto/server.h>
#include <proto/stream.h>
diff --git a/src/server.c b/src/server.c
index df90b22..4751065 100644
--- a/src/server.c
+++ b/src/server.c
@@ -28,6 +28,7 @@
#include <haproxy/errors.h>
#include <haproxy/global.h>
#include <haproxy/namespace.h>
+#include <haproxy/queue.h>
#include <haproxy/sample.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
@@ -36,7 +37,6 @@
#include <haproxy/port_range.h>
#include <haproxy/protocol.h>
-#include <proto/queue.h>
#include <proto/server.h>
#include <proto/stream.h>
#include <netinet/tcp.h>
diff --git a/src/stream.c b/src/stream.c
index b73060d..45c1bc8 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -42,6 +42,7 @@
#include <haproxy/log.h>
#include <haproxy/pool.h>
#include <haproxy/proxy.h>
+#include <haproxy/queue.h>
#include <haproxy/session.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
@@ -55,7 +56,6 @@
#include <haproxy/freq_ctr.h>
#include <proto/stream.h>
#include <haproxy/pipe.h>
-#include <proto/queue.h>
#include <proto/server.h>
#include <haproxy/stick_table.h>