From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 19:07:02 +0000 (+0200)
Subject: REORG: include: move channel.h to haproxy/channel{,-t}.h
X-Git-Tag: v2.2-dev9~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d32c475c3db61d15ccc6a31a7092f7fd21322f;p=thirdparty%2Fhaproxy.git

REORG: include: move channel.h to haproxy/channel{,-t}.h

The files were moved with no change. The callers were cleaned up a bit
and a few of them had channel.h removed since not needed.
---

diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c
index 0458639894..905cc2f2a0 100644
--- a/contrib/debug/flags.c
+++ b/contrib/debug/flags.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <types/channel.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/connection-t.h>
 #include <types/http_ana.h>
 #include <types/stream.h>
diff --git a/include/types/channel.h b/include/haproxy/channel-t.h
similarity index 99%
rename from include/types/channel.h
rename to include/haproxy/channel-t.h
index d3823f2626..affa942f07 100644
--- a/include/types/channel.h
+++ b/include/haproxy/channel-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/channel.h
+ * include/haproxy/channel-t.h
  * Channel management definitions, macros and inline functions.
  *
  * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_CHANNEL_H
-#define _TYPES_CHANNEL_H
+#ifndef _HAPROXY_CHANNEL_T_H
+#define _HAPROXY_CHANNEL_T_H
 
-#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
+#include <haproxy/api-t.h>
 
 /* The CF_* macros designate Channel Flags, which may be ORed in the bit field
  * member 'flags' in struct channel. Here we have several types of flags :
@@ -301,7 +301,7 @@ struct channel {
        long.
  */
 
-#endif /* _TYPES_CHANNEL_H */
+#endif /* _HAPROXY_CHANNEL_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/channel.h b/include/haproxy/channel.h
similarity index 99%
rename from include/proto/channel.h
rename to include/haproxy/channel.h
index 3ff81ad9ab..96f076e1fa 100644
--- a/include/proto/channel.h
+++ b/include/haproxy/channel.h
@@ -1,8 +1,8 @@
 /*
- * include/proto/channel.h
+ * include/haproxy/channel.h
  * Channel management definitions, macros and inline functions.
  *
- * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,28 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_CHANNEL_H
-#define _PROTO_CHANNEL_H
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#ifndef _HAPROXY_CHANNEL_H
+#define _HAPROXY_CHANNEL_H
 
 #include <haproxy/api.h>
-#include <haproxy/chunk.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/global.h>
 #include <haproxy/htx.h>
 #include <haproxy/stream_interface-t.h>
+#include <haproxy/task.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/channel.h>
-#include <types/stream.h>
-
 #include <proto/stream.h>
-#include <haproxy/task.h>
+#include <types/stream.h>
 
 /* perform minimal intializations, report 0 in case of error, 1 if OK. */
 int init_channel();
@@ -1020,7 +1013,7 @@ static inline int co_getchr(struct channel *chn)
 }
 
 
-#endif /* _PROTO_CHANNEL_H */
+#endif /* _HAPROXY_CHANNEL_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h
index 36bcb2b918..6257c247f5 100644
--- a/include/haproxy/cli.h
+++ b/include/haproxy/cli.h
@@ -24,9 +24,9 @@
 #define _HAPROXY_CLI_H
 
 #include <haproxy/applet-t.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/cli-t.h>
 #include <haproxy/global.h>
-#include <types/channel.h>
 #include <types/stream.h>
 
 
diff --git a/include/haproxy/http_fetch.h b/include/haproxy/http_fetch.h
index 549d77329e..c409b1633c 100644
--- a/include/haproxy/http_fetch.h
+++ b/include/haproxy/http_fetch.h
@@ -24,9 +24,9 @@
 
 #include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/sample-t.h>
-#include <types/channel.h>
 
 struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct check *check, int vol);
 int val_hdr(struct arg *arg, char **err_msg);
diff --git a/include/haproxy/stream_interface.h b/include/haproxy/stream_interface.h
index 7322dd187a..653ae39e90 100644
--- a/include/haproxy/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -24,9 +24,9 @@
 
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/stream_interface-t.h>
-#include <proto/channel.h>
 #include <types/stream.h>
 
 
diff --git a/include/proto/filters.h b/include/proto/filters.h
index 2ece1894dd..9e8cc74f88 100644
--- a/include/proto/filters.h
+++ b/include/proto/filters.h
@@ -21,14 +21,12 @@
 #ifndef _PROTO_FILTERS_H
 #define _PROTO_FILTERS_H
 
-#include <types/channel.h>
+#include <haproxy/channel.h>
 #include <types/filters.h>
 #include <types/http_ana.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
-#include <proto/channel.h>
-
 extern const char *trace_flt_id;
 extern const char *http_comp_flt_id;
 extern const char *cache_store_flt_id;
diff --git a/include/proto/http_ana.h b/include/proto/http_ana.h
index 00a38121b6..8648865dde 100644
--- a/include/proto/http_ana.h
+++ b/include/proto/http_ana.h
@@ -23,8 +23,8 @@
 #define _PROTO_PROTO_HTTP_H
 
 #include <haproxy/api.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/htx.h>
-#include <types/channel.h>
 #include <types/http_ana.h>
 #include <types/stream.h>
 
diff --git a/include/types/http_ana.h b/include/types/http_ana.h
index 4dd8e33360..6ebe772bfe 100644
--- a/include/types/http_ana.h
+++ b/include/types/http_ana.h
@@ -22,10 +22,9 @@
 #ifndef _TYPES_PROTO_HTTP_H
 #define _TYPES_PROTO_HTTP_H
 
+#include <haproxy/channel-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/http-t.h>
-
-#include <types/channel.h>
 #include <haproxy/http_htx-t.h>
 
 /* These are the flags that are found in txn->flags */
diff --git a/include/types/stream.h b/include/types/stream.h
index a67d1926e7..2a5fb77f4e 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -29,6 +29,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/list-t.h>
@@ -37,7 +38,6 @@
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/vars-t.h>
 
-#include <types/channel.h>
 #include <types/filters.h>
 #include <types/http_ana.h>
 #include <types/proxy.h>
diff --git a/src/acl.c b/src/acl.c
index 259b79a7b9..275087de7e 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -24,7 +24,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
diff --git a/src/activity.c b/src/activity.c
index 29977d2a7a..92bce339c6 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -12,12 +12,12 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/activity-t.h>
-#include <proto/channel.h>
 #include <haproxy/freq_ctr.h>
 
 
diff --git a/src/applet.c b/src/applet.c
index 36607aa88c..e27e2a6e29 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -15,10 +15,10 @@
 
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/list.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <proto/channel.h>
 #include <proto/stream.h>
 
 unsigned int nb_applets = 0;
diff --git a/src/backend.c b/src/backend.c
index f06cf64f2b..d4805d7410 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -21,6 +21,7 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
@@ -46,7 +47,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/backend.h>
-#include <proto/channel.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
diff --git a/src/cache.c b/src/cache.c
index 8a97f4ef3f..80bc545d4d 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -12,6 +12,7 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
@@ -23,7 +24,6 @@
 #include <types/filters.h>
 #include <types/proxy.h>
 
-#include <proto/channel.h>
 #include <proto/proxy.h>
 #include <proto/filters.h>
 #include <proto/http_ana.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 429954ca18..15f768eecf 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -39,6 +39,7 @@
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
@@ -69,7 +70,6 @@
 #include <haproxy/global.h>
 
 #include <proto/backend.h>
-#include <proto/channel.h>
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
diff --git a/src/channel.c b/src/channel.c
index ae5c981c72..a3b7b9e3ea 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -17,8 +17,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
-
-#include <proto/channel.h>
+#include <haproxy/channel.h>
 
 
 /* Schedule up to <bytes> more bytes to be forwarded via the channel without
diff --git a/src/cli.c b/src/cli.c
index d72fb5b876..9e6b56ac35 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -29,6 +29,7 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/dns-t.h>
@@ -53,7 +54,6 @@
 
 #include <haproxy/activity.h>
 #include <proto/backend.h>
-#include <proto/channel.h>
 #include <haproxy/compression.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
diff --git a/src/dns.c b/src/dns.c
index 799c7eb997..54c078009f 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -23,6 +23,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/check.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
@@ -39,7 +40,6 @@
 
 #include <haproxy/global.h>
 
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/http_ana.h>
 #include <proto/log.h>
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 1c200cefca..aaf63d37f9 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -13,12 +13,12 @@
 #include <ctype.h>
 
 #include <haproxy/api.h>
+#include <haproxy/channel-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
-#include <types/channel.h>
 #include <types/filters.h>
 #include <haproxy/global.h>
 #include <types/proxy.h>
diff --git a/src/frontend.c b/src/frontend.c
index 5f3d6cf118..63ab35699a 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -35,7 +35,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
diff --git a/src/h1.c b/src/h1.c
index 9ac575b7d6..80f8192b25 100644
--- a/src/h1.c
+++ b/src/h1.c
@@ -15,8 +15,6 @@
 #include <haproxy/h1.h>
 #include <haproxy/http-hdr.h>
 
-#include <proto/channel.h>
-
 /* Parse the Content-Length header field of an HTTP/1 request. The function
  * checks all possible occurrences of a comma-delimited value, and verifies
  * if any of them doesn't match a previous value. It returns <0 if a value
diff --git a/src/haproxy.c b/src/haproxy.c
index e3b140b892..44e4ff32b0 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -122,7 +122,6 @@
 #include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <proto/backend.h>
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
 #include <proto/log.h>
diff --git a/src/hlua.c b/src/hlua.c
index 804f9fa92c..fbca16f64e 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -26,6 +26,7 @@
 #include <import/ebpttree.h>
 
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/http_htx.h>
@@ -53,7 +54,6 @@
 #include <types/proxy.h>
 
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <proto/queue.h>
 #include <proto/http_ana.h>
 #include <proto/server.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index 4675a2d0de..ee43a69e7b 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -14,6 +14,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
+#include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
 #include <haproxy/http.h>
@@ -28,7 +29,6 @@
 
 #include <haproxy/capture-t.h>
 
-#include <proto/channel.h>
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index f617aa9def..7209fc669c 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -19,6 +19,7 @@
 #include <haproxy/auth.h>
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
+#include <haproxy/channel.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
 #include <haproxy/global.h>
@@ -35,7 +36,6 @@
 #include <haproxy/version.h>
 
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/stream.h>
diff --git a/src/payload.c b/src/payload.c
index c4f8b2cf9e..c84a124f89 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -15,13 +15,13 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/payload.h>
 #include <haproxy/pattern.h>
 #include <haproxy/htx.h>
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <haproxy/sample.h>
 #include <proto/http_ana.h>
 
diff --git a/src/peers.c b/src/peers.c
index ee5b1caa70..c5d8095915 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -22,6 +22,7 @@
 
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/dict.h>
 #include <haproxy/frontend.h>
@@ -37,7 +38,6 @@
 #include <haproxy/tools.h>
 #include <haproxy/thread.h>
 
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
diff --git a/src/pool.c b/src/pool.c
index a811c77e0a..41d9c449a2 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -13,6 +13,7 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/global.h>
 
@@ -26,7 +27,6 @@
 
 #include <haproxy/activity-t.h>
 
-#include <proto/channel.h>
 #include <proto/log.h>
 
 #ifdef CONFIG_HAP_LOCAL_POOLS
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 43a0029e1d..e25bbdb844 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -32,6 +32,7 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -45,7 +46,6 @@
 #include <types/stream.h>
 
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <haproxy/port_range.h>
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index f971bee7ce..43fe01d3bd 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 
 #include <haproxy/base64.h>
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/ssl_ckch.h>
@@ -32,8 +33,6 @@
 
 #include <import/ebsttree.h>
 
-#include <proto/channel.h>
-
 /* Uncommitted CKCH transaction */
 
 static struct {
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 118a6d1bea..3890ca833e 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/ssl_ckch.h>
@@ -27,8 +28,6 @@
 #include <import/ebpttree.h>
 #include <import/ebsttree.h>
 
-#include <proto/channel.h>
-
 /* release ssl bind conf */
 void ssl_sock_free_ssl_conf(struct ssl_bind_conf *conf)
 {
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 88c60c7732..6ce493a607 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -45,6 +45,7 @@
 #include <import/xxhash.h>
 
 #include <haproxy/dynbuf.h>
+#include <haproxy/channel.h>
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
@@ -72,7 +73,6 @@
 #include <import/ebsttree.h>
 
 #include <haproxy/arg.h>
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proto_tcp.h>
diff --git a/src/stats.c b/src/stats.c
index a4620563cb..573721566f 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -27,6 +27,7 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/compression.h>
@@ -55,7 +56,6 @@
 #include <haproxy/base64.h>
 
 #include <proto/backend.h>
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
diff --git a/src/stream.c b/src/stream.c
index 32964f9b57..6ec17947f0 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
@@ -46,7 +47,6 @@
 #include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <proto/backend.h>
-#include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
diff --git a/src/stream_interface.c b/src/stream_interface.c
index cbc8a23cf0..6b6b76d6c5 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -21,6 +21,7 @@
 
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http_htx.h>
@@ -30,7 +31,6 @@
 #include <haproxy/time.h>
 #include <haproxy/task.h>
 
-#include <proto/channel.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index ef78d20177..e7abdd76f0 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -14,6 +14,7 @@
 #include <haproxy/api.h>
 #include <haproxy/capture-t.h>
 #include <common/cfgparse.h>
+#include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
@@ -26,7 +27,6 @@
 
 #include <haproxy/arg-t.h>
 
-#include <proto/channel.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <haproxy/stick_table.h>