CLEANUP: include: tree-wide alphabetical sort of include files

This patch fixes all the leftovers from the include cleanup campaign. There
were not that many (~400 entries in ~150 files) but it was definitely worth
doing it as it revealed a few duplicates.

contrib/mod_defender/defender.c

@@ -19,10 +19,10 @@
 #include <stdarg.h>
 
 #include <haproxy/api.h>
-#include <haproxy/tools.h>
 #include <haproxy/chunk.h>
 #include <haproxy/spoe.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 #include <http_core.h>
 #include <http_main.h>

contrib/mod_defender/spoa.c

@@ -31,8 +31,8 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/list.h>
 #include <haproxy/chunk.h>
+#include <haproxy/list.h>
 #include <haproxy/spoe.h>
 
 #include "spoa.h"

contrib/modsecurity/spoa.c

@@ -36,8 +36,8 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/list.h>
 #include <haproxy/chunk.h>
+#include <haproxy/list.h>
 #include <haproxy/spoe.h>
 
 #include "spoa.h"

contrib/prometheus-exporter/service-prometheus.c

@@ -14,10 +14,11 @@
  */
 
 #include <haproxy/action-t.h>
+#include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
+#include <haproxy/compression.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -26,10 +27,8 @@
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
-#include <haproxy/pool.h>
-
-#include <haproxy/compression.h>
 #include <haproxy/pipe.h>
+#include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>

include/haproxy/acl.h

@@ -23,8 +23,8 @@
 #define _HAPROXY_ACL_H
 
 #include <haproxy/acl-t.h>
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 
 struct stream;
 

include/haproxy/action-t.h

@@ -22,9 +22,8 @@
 #ifndef _HAPROXY_ACTION_T_H
 #define _HAPROXY_ACTION_T_H
 
-#include <haproxy/regex-t.h>
-
 #include <haproxy/applet-t.h>
+#include <haproxy/regex-t.h>
 #include <haproxy/stick_table-t.h>
 
 enum act_from {

include/haproxy/activity.h

@@ -22,10 +22,10 @@
 #ifndef _HAPROXY_ACTIVITY_H
 #define _HAPROXY_ACTIVITY_H
 
-#include <haproxy/api.h>
-#include <haproxy/time.h>
 #include <haproxy/activity-t.h>
+#include <haproxy/api.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/time.h>
 
 extern unsigned int profiling;
 extern unsigned long task_profiling_mask;

include/haproxy/api.h

@@ -30,9 +30,9 @@
 #ifndef _HAPROXY_BASE_H
 #define _HAPROXY_BASE_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/atomic.h>
 #include <haproxy/bug.h>
 #include <haproxy/initcall.h>
-#include <haproxy/api-t.h>
 
 #endif

include/haproxy/applet-t.h

@@ -22,6 +22,7 @@
 #ifndef _HAPROXY_APPLET_T_H
 #define _HAPROXY_APPLET_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/freq_ctr-t.h>
@@ -29,7 +30,6 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/xref-t.h>
 
 /* flags for appctx->state */

include/haproxy/applet.h

@@ -24,8 +24,8 @@
 
 #include <stdlib.h>
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 #include <haproxy/task.h>

include/haproxy/arg-t.h

@@ -28,9 +28,8 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/protobuf-t.h>
-#include <haproxy/vars-t.h>
-
 #include <haproxy/stick_table-t.h>
+#include <haproxy/vars-t.h>
 
 /* encoding of each arg type : up to 31 types are supported */
 #define ARGT_BITS      5

include/haproxy/auth-t.h

@@ -14,8 +14,8 @@
 #ifndef _HAPROXY_AUTH_T_H
 #define _HAPROXY_AUTH_T_H
 
-#include <haproxy/auth-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/auth-t.h>
 #include <haproxy/list-t.h>
 
 #define AU_O_INSECURE	0x00000001		/* insecure, unencrypted password */

include/haproxy/auth.h

@@ -14,8 +14,8 @@
 #ifndef _HAPROXY_AUTH_H
 #define _HAPROXY_AUTH_H
 
-#include <haproxy/auth-t.h>
 #include <haproxy/api.h>
+#include <haproxy/auth-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/sample-t.h>
 

include/haproxy/backend-t.h

@@ -22,6 +22,7 @@
 #ifndef _HAPROXY_BACKEND_T_H
 #define _HAPROXY_BACKEND_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/lb_chash-t.h>
 #include <haproxy/lb_fas-t.h>
 #include <haproxy/lb_fwlc-t.h>
@@ -29,7 +30,6 @@
 #include <haproxy/lb_map-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 /* Parameters for lbprm.algo */
 

include/haproxy/backend.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_BACKEND_H
 #define _HAPROXY_BACKEND_H
 
-#include <haproxy/backend-t.h>
 #include <haproxy/api.h>
+#include <haproxy/backend-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/stream-t.h>

include/haproxy/channel-t.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_CHANNEL_T_H
 #define _HAPROXY_CHANNEL_T_H
 
-#include <haproxy/buf-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/buf-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 :

include/haproxy/channel.h

@@ -30,9 +30,9 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task.h>
-#include <haproxy/tools-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools-t.h>
 
 
 /* perform minimal intializations, report 0 in case of error, 1 if OK. */

include/haproxy/check-t.h

@@ -17,11 +17,11 @@
 
 #include <import/ebpttree.h>
 #include <import/ist.h>
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 /* Please note: this file tends to commonly be part of circular dependencies,

include/haproxy/chunk.h

@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
-#include <import/ist.h>
 #include <haproxy/pool.h>
 
 

include/haproxy/connection-t.h

@@ -30,12 +30,12 @@
 
 #include <import/ist.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/port_range-t.h>
 #include <haproxy/protocol-t.h>
-#include <haproxy/api-t.h>
 
 /* referenced below */
 struct connection;

include/haproxy/dns-t.h

@@ -25,12 +25,11 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/connection-t.h>
-#include <haproxy/obj_type-t.h>
 #include <haproxy/list-t.h>
-#include <haproxy/thread.h>
-
+#include <haproxy/obj_type-t.h>
 #include <haproxy/proto_udp-t.h>
 #include <haproxy/task-t.h>
+#include <haproxy/thread.h>
 
 extern struct pool_head *dns_requester_pool;
 

include/haproxy/fcgi-app-t.h

@@ -26,12 +26,12 @@
 #include <import/ist.h>
 
 #include <haproxy/acl-t.h>
+#include <haproxy/api-t.h>
 #include <haproxy/arg-t.h>
 #include <haproxy/fcgi.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
-#include <haproxy/api-t.h>
 
 #define FCGI_APP_FL_KEEP_CONN     0x00000001 /* Keep the connection alive */
 #define FCGI_APP_FL_GET_VALUES    0x00000002 /* Retrieve FCGI variables on connection establishment */

include/haproxy/filters-t.h

@@ -21,8 +21,8 @@
 #ifndef _HAPROXY_FILTERS_T_H
 #define _HAPROXY_FILTERS_T_H
 
-#include <haproxy/list-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/list-t.h>
 
 /* Flags set on a filter config */
 #define FLT_CFG_FL_HTX    0x00000001  /* The filter can filter HTX streams */

include/haproxy/global-t.h

@@ -22,10 +22,10 @@
 #ifndef _HAPROXY_GLOBAL_T_H
 #define _HAPROXY_GLOBAL_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/list-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 /* modes of operation (global.mode) */

include/haproxy/global.h

@@ -22,10 +22,10 @@
 #ifndef _HAPROXY_GLOBAL_H
 #define _HAPROXY_GLOBAL_H
 
-#include <haproxy/global-t.h>
 #include <haproxy/api-t.h>
-#include <haproxy/vars-t.h>
+#include <haproxy/global-t.h>
 #include <haproxy/mworker-t.h>
+#include <haproxy/vars-t.h>
 
 extern struct global global;
 extern int  pid;                /* current process id */

include/haproxy/hlua-t.h

@@ -33,9 +33,8 @@
 #include <haproxy/proxy-t.h>
 #include <haproxy/regex-t.h>
 #include <haproxy/server-t.h>
-#include <haproxy/xref-t.h>
-
 #include <haproxy/stick_table-t.h>
+#include <haproxy/xref-t.h>
 
 #define CLASS_CORE         "Core"
 #define CLASS_TXN          "TXN"

include/haproxy/http_ana-t.h

@@ -22,9 +22,9 @@
 #ifndef _HAPROXY_PROTO_HTTP_T_H
 #define _HAPROXY_PROTO_HTTP_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/http-t.h>
-#include <haproxy/api-t.h>
 
 /* These are the flags that are found in txn->flags */
 

include/haproxy/http_fetch.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_HTTP_FETCH_H
 #define _HAPROXY_HTTP_FETCH_H
 
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/sample-t.h>

include/haproxy/http_htx-t.h

@@ -24,9 +24,9 @@
 #define _HAPROXY_HTTP_HTX_T_H
 
 #include <import/ebistree.h>
+#include <import/ist.h>
 
 #include <haproxy/buf-t.h>
-#include <import/ist.h>
 #include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
 #include <haproxy/list-t.h>

include/haproxy/http_rules.h

@@ -22,9 +22,9 @@
 #ifndef _HAPROXY_HTTP_RULES_H
 #define _HAPROXY_HTTP_RULES_H
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/list.h>
-#include <haproxy/action-t.h>
 #include <haproxy/proxy-t.h>
 
 extern struct action_kw_list http_req_keywords;

include/haproxy/htx.h

@@ -26,8 +26,8 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
-#include <haproxy/http-t.h>
 #include <haproxy/http-hdr-t.h>
+#include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
 
 extern struct htx htx_empty;

include/haproxy/lb_chash-t.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_LB_CHASH_T_H
 #define _HAPROXY_LB_CHASH_T_H
 
-#include <import/ebtree.h>
 #include <import/eb32tree.h>
+#include <import/ebtree.h>
 
 struct lb_chash {
 	struct eb_root act;	/* weighted chash entries of active servers */

include/haproxy/lb_map-t.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_LB_MAP_T_H
 #define _HAPROXY_LB_MAP_T_H
 
-#include <haproxy/server-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/server-t.h>
 
 struct lb_map {
 	struct server **srv;	/* the server map used to apply weights */

include/haproxy/listener-t.h

@@ -27,10 +27,10 @@
 
 #include <import/eb32tree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>
-#include <haproxy/api-t.h>
 
 #ifdef USE_OPENSSL
 #include <haproxy/openssl-compat.h>

include/haproxy/log-t.h

@@ -26,10 +26,10 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/ring-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 
 #define NB_LOG_FACILITIES       24

include/haproxy/namespace.h

@@ -25,8 +25,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <haproxy/namespace-t.h>
 #include <import/ebistree.h>
+#include <haproxy/namespace-t.h>
 
 #ifdef USE_NS
 

include/haproxy/obj_type.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_OBJ_TYPE_H
 #define _HAPROXY_OBJ_TYPE_H
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/listener-t.h>

include/haproxy/pattern-t.h

@@ -24,12 +24,11 @@
 
 #include <import/ebmbtree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
-#include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
-
 #include <haproxy/sample_data-t.h>
+#include <haproxy/thread-t.h>
 
 
 /* Pattern matching function result.

include/haproxy/peers-t.h

@@ -29,10 +29,10 @@
 
 #include <import/eb32tree.h>
 
-#include <haproxy/dict-t.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/dict-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/thread-t.h>
 
 
 struct shared_table {

include/haproxy/proto_tcp.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_PROTO_TCP_H
 #define _HAPROXY_PROTO_TCP_H
 
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/sample-t.h>

include/haproxy/proxy-t.h

@@ -30,6 +30,7 @@
 #include <import/eb32tree.h>
 #include <import/ebpttree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/arg-t.h>
 #include <haproxy/backend-t.h>
 #include <haproxy/counters-t.h>
@@ -39,7 +40,6 @@
 #include <haproxy/server-t.h>
 #include <haproxy/tcpcheck-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 /* values for proxy->state */
 enum pr_state {

include/haproxy/proxy.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_PROXY_H
 #define _HAPROXY_PROXY_H
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/proxy-t.h>

include/haproxy/queue.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_QUEUE_H
 #define _HAPROXY_QUEUE_H
 
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/queue-t.h>

include/haproxy/sample-t.h

@@ -23,8 +23,8 @@
 #ifndef _HAPROXY_SAMPLE_T_H
 #define _HAPROXY_SAMPLE_T_H
 
-#include <haproxy/list-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/list-t.h>
 #include <haproxy/sample_data-t.h>
 
 /* input and output sample types */

include/haproxy/sample.h

@@ -23,8 +23,8 @@
 #ifndef _HAPROXY_SAMPLE_H
 #define _HAPROXY_SAMPLE_H
 
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/stick_table-t.h>
 

include/haproxy/server-t.h

@@ -28,6 +28,7 @@
 #include <import/eb32tree.h>
 #include <import/ebmbtree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/counters-t.h>
@@ -40,7 +41,6 @@
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 
 /* server states. Only SRV_ST_STOPPED indicates a down server. */

include/haproxy/server.h

@@ -24,9 +24,8 @@
 
 #include <unistd.h>
 
-
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proxy-t.h>

include/haproxy/sink-t.h

@@ -23,8 +23,8 @@
 #define _HAPROXY_SINK_T_H
 
 #include <import/ist.h>
-#include <haproxy/list-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/list-t.h>
 
 /* A sink may be of 4 distinct types :
  *   - file descriptor (such as stdout)

include/haproxy/ssl_sock-t.h

@@ -29,12 +29,12 @@
 
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h> /* struct wait_event */
-#include <haproxy/thread-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ssl_ckch-t.h>
 #include <haproxy/ssl_crtlist-t.h>
+#include <haproxy/thread-t.h>
 
 /* ***** READ THIS before adding code here! *****
  *

include/haproxy/ssl_sock.h

@@ -26,9 +26,9 @@
 
 #include <haproxy/connection.h>
 #include <haproxy/openssl-compat.h>
-#include <haproxy/ssl_sock-t.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/proxy-t.h>
+#include <haproxy/ssl_sock-t.h>
 #include <haproxy/thread.h>
 
 extern struct list tlskeys_reference;

include/haproxy/stats.h

@@ -23,10 +23,10 @@
 #ifndef _HAPROXY_STATS_H
 #define _HAPROXY_STATS_H
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <haproxy/stream_interface-t.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/tools-t.h>
 
 

include/haproxy/stick_table-t.h

@@ -30,9 +30,9 @@
 #include <import/ebmbtree.h>
 #include <import/ebpttree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 
 /* The types of extra data we can store in a stick table */

include/haproxy/stick_table.h

@@ -28,9 +28,9 @@
 #include <haproxy/errors.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/stick_table-t.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 extern struct stktable *stktables_list;
 extern struct stktable_type stktable_types[];

include/haproxy/stream-t.h

@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
@@ -40,7 +41,6 @@
 #include <haproxy/stick_table-t.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 

include/haproxy/stream_interface.h

@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_STREAM_INTERFACE_H
 #define _HAPROXY_STREAM_INTERFACE_H
 
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/stream-t.h>

include/haproxy/task-t.h

@@ -27,9 +27,9 @@
 #include <import/eb32sctree.h>
 #include <import/eb32tree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 /* values for task->state */
 #define TASK_SLEEPING     0x0000  /* task sleeping */

include/haproxy/tcpcheck-t.h

@@ -20,12 +20,12 @@
 
 #include <import/ebpttree.h>
 #include <import/ist.h>
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 /* options for tcp-check connect */

include/haproxy/tools.h

@@ -37,11 +37,11 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <import/eb32tree.h>
 #include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 #include <haproxy/api.h>
-#include <haproxy/intops.h>
 #include <haproxy/chunk.h>
+#include <haproxy/intops.h>
 #include <haproxy/namespace-t.h>
 #include <haproxy/protocol-t.h>
 #include <haproxy/tools-t.h>

include/haproxy/trace-t.h

@@ -23,9 +23,9 @@
 #define _HAPROXY_TRACE_T_H
 
 #include <import/ist.h>
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/sink-t.h>
-#include <haproxy/api-t.h>
 
 /* the macros below define an optional type for each of the 4 args passed to
  * the trace() call. When such a type is set, the caller commits to exclusively

include/haproxy/vars.h

@@ -22,9 +22,9 @@
 #ifndef _HAPROXY_VARS_H
 #define _HAPROXY_VARS_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 void vars_init(struct vars *vars, enum vars_scope scope);

src/51d.c

@@ -1,20 +1,20 @@
 #include <stdio.h>
 
+#include <import/lru.h>
+#include <import/xxhash.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <haproxy/buf-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
-#include <haproxy/thread.h>
-#include <haproxy/global.h>
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
+#include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <import/xxhash.h>
-#include <import/lru.h>
 #include <51Degrees.h>
 
 struct _51d_property_names {

src/acl.c

@@ -14,22 +14,20 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <import/ebsttree.h>
+
 #include <haproxy/acl.h>
-#include <haproxy/auth.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/auth.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pattern.h>
 #include <haproxy/proxy-t.h>
-#include <haproxy/tools.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
 #include <haproxy/stick_table.h>
-
-#include <import/ebsttree.h>
+#include <haproxy/tools.h>
 
 /* List head of all known ACL keywords */
 static struct acl_kw_list acl_keywords = {

src/action.c

@@ -13,15 +13,14 @@
 #include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
+#include <haproxy/list.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
-#include <haproxy/list.h>
 #include <haproxy/proxy.h>
+#include <haproxy/stick_table.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/stick_table.h>
-
 
 /* Find and check the target table used by an action track-sc*. This
  * function should be called during the configuration validity check.

src/activity.c

@@ -10,14 +10,14 @@
  *
  */
 
+#include <haproxy/activity-t.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
-#include <haproxy/activity-t.h>
-#include <haproxy/freq_ctr.h>
 
 
 /* bit field of profiling options. Beware, may be modified at runtime! */

src/applet.c

@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/list.h>
 #include <haproxy/stream.h>

src/arg.c

@@ -14,10 +14,10 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include <haproxy/tools.h>
+#include <haproxy/arg.h>
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
-#include <haproxy/arg.h>
+#include <haproxy/tools.h>
 
 const char *arg_type_names[ARGT_NBTYPES] = {
 	[ARGT_STOP] = "end of arguments",

src/auth.c

@@ -25,10 +25,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <haproxy/auth-t.h>
 #include <haproxy/api.h>
-#include <haproxy/global.h>
+#include <haproxy/auth-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/thread.h>

src/backend.c

@@ -20,11 +20,13 @@
 #include <sys/types.h>
 
 #include <haproxy/acl.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/backend.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
@@ -36,10 +38,14 @@
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/lb_map.h>
 #include <haproxy/log.h>
+#include <haproxy/namespace.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/payload.h>
+#include <haproxy/proto_tcp.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
@@ -49,14 +55,6 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/trace.h>
-#include <haproxy/namespace.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/protocol.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/sample.h>
 
 #define TRACE_SOURCE &trace_strm
 

src/buffer.c

@@ -16,11 +16,10 @@
 
 #include <haproxy/api.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 
-#include <haproxy/global.h>
-
 struct pool_head *pool_head_buffer;
 
 /* list of objects waiting for at least one buffer */

src/cache.c

@@ -10,6 +10,9 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <import/eb32tree.h>
+#include <import/sha1.h>
+
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
@@ -17,20 +20,16 @@
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
+#include <haproxy/hash.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/htx.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
-#include <import/eb32tree.h>
-#include <import/sha1.h>
-
-
-#include <haproxy/hash.h>
-#include <haproxy/htx.h>
-#include <haproxy/net_helper.h>
 
 #define CACHE_FLT_F_IMPLICIT_DECL  0x00000001 /* The cache filtre was implicitly declared (ie without
 					       * the filter keyword) */

src/cfgparse-listen.c

@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <haproxy/uri_auth.h>
-
 #include <haproxy/acl.h>
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
@@ -25,14 +23,14 @@
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/peers.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/stats-t.h>
-#include <haproxy/tcpcheck.h>
-
-#include <haproxy/protocol.h>
 #include <haproxy/stick_table.h>
+#include <haproxy/tcpcheck.h>
+#include <haproxy/uri_auth.h>
 
 /* Report a warning if a rule is placed after a 'tcp-request session' rule.
  * Return 1 if the warning has been emitted, otherwise 0.

src/cfgparse.c

@@ -35,9 +35,9 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action-t.h>
+#include <haproxy/api.h>
 #include <haproxy/auth.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
 #include <haproxy/capture.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
@@ -48,6 +48,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/lb_chash.h>
@@ -58,28 +59,25 @@
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/mailers.h>
+#include <haproxy/namespace.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers-t.h>
+#include <haproxy/peers.h>
 #include <haproxy/pool.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
+#include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth-t.h>
-#include <haproxy/namespace.h>
-#include <haproxy/server.h>
-#include <haproxy/task.h>
-#include <haproxy/thread.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/protocol.h>
-#include <haproxy/peers.h>
-#include <haproxy/sample.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
+#include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
+#include <haproxy/uri_auth-t.h>
 
 
 /* Used to chain configuration sections definitions. This list

src/check.c

@@ -31,42 +31,41 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
 #include <haproxy/extcheck.h>
-#include <haproxy/istbuf.h>
-#include <haproxy/list.h>
-#include <haproxy/mailers.h>
-#include <haproxy/queue.h>
-#include <haproxy/regex.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/thread.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
+#include <haproxy/h1.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
-#include <haproxy/h1.h>
 #include <haproxy/htx.h>
+#include <haproxy/istbuf.h>
+#include <haproxy/list.h>
 #include <haproxy/log.h>
+#include <haproxy/mailers.h>
+#include <haproxy/port_range.h>
+#include <haproxy/proto_tcp.h>
+#include <haproxy/proto_udp.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
+#include <haproxy/queue.h>
+#include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
+#include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/port_range.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/protocol.h>
-#include <haproxy/proto_udp.h>
-#include <haproxy/sample.h>
 
 static int wake_srv_chk(struct conn_stream *cs);
 struct data_cb check_conn_cb = {

src/chunk.c

@@ -17,9 +17,8 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
-#include <haproxy/tools.h>
-
 #include <haproxy/global.h>
+#include <haproxy/tools.h>
 
 /* trash chunks used for various conversions */
 static THREAD_LOCAL struct buffer *trash_chunk;

src/cli.c

@@ -26,21 +26,29 @@
 
 #include <net/if.h>
 
-#include <haproxy/applet-t.h>
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
+#include <haproxy/base64.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
+#include <haproxy/compression.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/mworker-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/peers.h>
+#include <haproxy/pipe.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/server.h>
@@ -49,20 +57,10 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/version.h>
-#include <haproxy/base64.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/compression.h>
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/pipe.h>
-#include <haproxy/protocol.h>
 
 #define PAYLOAD_PATTERN "<<"
 

src/compression.c

@@ -28,16 +28,14 @@
 
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
+#include <haproxy/compression-t.h>
+#include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/freq_ctr.h>
+#include <haproxy/global.h>
+#include <haproxy/pool.h>
 #include <haproxy/stream.h>
 #include <haproxy/thread.h>
-#include <haproxy/pool.h>
-
-#include <haproxy/global.h>
-#include <haproxy/compression-t.h>
-
-#include <haproxy/compression.h>
-#include <haproxy/freq_ctr.h>
 
 
 #if defined(USE_ZLIB)

src/connection.c

@@ -15,13 +15,12 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
+#include <haproxy/fd.h>
 #include <haproxy/frontend.h>
+#include <haproxy/hash.h>
 #include <haproxy/log-t.h>
 #include <haproxy/namespace.h>
-#include <haproxy/hash.h>
 #include <haproxy/net_helper.h>
-
-#include <haproxy/fd.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/sample.h>
 #include <haproxy/ssl_sock.h>

src/da.c

@@ -1,15 +1,15 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-#include <haproxy/global.h>
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <dac.h>

src/debug.c

@@ -24,18 +24,17 @@
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
 #include <haproxy/debug.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/log.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
-#include <import/ist.h>
-#include <haproxy/net_helper.h>
 #include <haproxy/tools.h>
+#include <import/ist.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/fd.h>
 
 /* mask of threads still having to dump, used to respect ordering. Only used
  * when USE_THREAD_DUMP is set.

src/dns.c

@@ -22,13 +22,17 @@
 #include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
-#include <haproxy/check.h>
 #include <haproxy/channel.h>
+#include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
+#include <haproxy/net_helper.h>
+#include <haproxy/proto_udp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
@@ -36,15 +40,10 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/time.h>
 #include <haproxy/ticks.h>
-#include <haproxy/net_helper.h>
+#include <haproxy/time.h>
 #include <haproxy/vars.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/fd.h>
-#include <haproxy/proto_udp.h>
 
 struct list dns_resolvers  = LIST_HEAD_INIT(dns_resolvers);
 struct list dns_srvrq_list = LIST_HEAD_INIT(dns_srvrq_list);

src/ebimtree.c

@@ -20,8 +20,8 @@
 
 /* Consult ebimtree.h for more details about those functions */
 
-#include <import/ebpttree.h>
 #include <import/ebimtree.h>
+#include <import/ebpttree.h>
 
 /* Find the first occurrence of a key of <len> bytes in the tree <root>.
  * If none can be found, return NULL.

src/ev_epoll.c

@@ -14,15 +14,14 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
 #include <haproxy/global.h>
 #include <haproxy/signal.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
+#include <haproxy/tools.h>
 
 
 /* private data */

src/ev_evports.c

@@ -18,16 +18,14 @@
 #include <errno.h>
 #include <syslog.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/signal.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 /*
  * Private data:
  */

src/ev_kqueue.c

@@ -17,16 +17,14 @@
 #include <sys/event.h>
 #include <sys/time.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/signal.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 
 /* private data */
 static int kqueue_fd[MAX_THREADS]; // per-thread kqueue_fd

src/ev_poll.c

@@ -17,15 +17,13 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 
 #ifndef POLLRDHUP
 /* POLLRDHUP was defined late in libc, and it appeared in kernel 2.6.17 */

src/ev_select.c

@@ -14,15 +14,13 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 
 /* private data */
 static int maxfd;   /* # of the highest fd + 1 */

src/fcgi-app.c

@@ -17,6 +17,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
 #include <haproxy/filters.h>
+#include <haproxy/global.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/log.h>
@@ -27,7 +28,6 @@
 #include <haproxy/session.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/global.h>
 
 /* Global list of all FCGI applications */
 static struct fcgi_app *fcgi_apps = NULL;

src/fcgi.c

@@ -24,8 +24,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <haproxy/fcgi.h>
 #include <haproxy/buf.h>
+#include <haproxy/fcgi.h>
 #include <haproxy/istbuf.h>
 
 /* Encodes header of a FCGI record into the chunk <out>. It returns non-zero on

src/fd.c

@@ -87,13 +87,12 @@
 #include <errno.h>
 #endif
 
-
 #include <haproxy/api.h>
-#include <haproxy/global.h>
-
 #include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/port_range.h>
 
+
 struct fdtab *fdtab = NULL;     /* array of all the file descriptors */
 struct polled_mask *polled_mask = NULL; /* Array for the polled_mask of each fd */
 struct fdinfo *fdinfo = NULL;   /* less-often used infos for file descriptors */

src/flt_spoe.c

@@ -14,8 +14,8 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action-t.h>
-#include <haproxy/arg.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
@@ -23,17 +23,17 @@
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
-#include <haproxy/sample.h>
-#include <haproxy/signal.h>
-#include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
 #include <haproxy/session.h>
+#include <haproxy/signal.h>
 #include <haproxy/spoe.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
 #include <haproxy/time.h>
 #include <haproxy/vars.h>
 

src/flt_trace.c

@@ -22,8 +22,8 @@
 #include <haproxy/htx.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/stream.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 const char *trace_flt_id = "trace filter";
 

src/freq_ctr.c

@@ -11,9 +11,9 @@
  */
 
 #include <haproxy/api.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 /* Read a frequency counter taking history into account for missing time in
  * current period. Current second is sub-divided in 1000 chunks of one ms,

src/frontend.c

@@ -24,23 +24,22 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/chunk.h>
+#include <haproxy/fd.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/log.h>
+#include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/proto_tcp.h>
 
 /* Finish a stream accept() for a proxy (TCP or HTTP). It returns a negative
  * value in case of a critical failure which must cause the listener to be

src/h2.c

@@ -27,12 +27,13 @@
 
 #include <inttypes.h>
 #include <haproxy/api.h>
-#include <haproxy/http.h>
+#include <haproxy/global.h>
 #include <haproxy/h2.h>
 #include <haproxy/http-hdr-t.h>
+#include <haproxy/http.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>
-#include <haproxy/global.h>
+
 
 struct h2_frame_definition h2_frame_definition[H2_FT_ENTRIES] =	{
 	 [H2_FT_DATA         ] = { .dir = 3, .min_id = 1, .max_id = H2_MAX_STREAM_ID, .min_len = 0, .max_len = H2_MAX_FRAME_LEN, },

src/haproxy.c

@@ -78,12 +78,15 @@
 #include <systemd/sd-daemon.h>
 #endif
 
-#include <haproxy/acl.h>
-#include <haproxy/auth.h>
-#include <haproxy/api.h>
 #include <import/sha1.h>
 
+#include <haproxy/acl.h>
+#include <haproxy/activity.h>
+#include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/auth.h>
 #include <haproxy/base64.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
@@ -91,10 +94,11 @@
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
 #include <haproxy/filters.h>
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/http_rules.h>
-#include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
@@ -104,29 +108,24 @@
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern.h>
 #include <haproxy/peers.h>
+#include <haproxy/pool.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
-#include <haproxy/sample.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/signal.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth-t.h>
-#include <haproxy/version.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
+#include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>
+#include <haproxy/version.h>
 
-#include <haproxy/capture-t.h>
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/protocol.h>
 
 /* array of init calls for older platforms */
 DECLARE_INIT_STAGES;

src/hlua.c

@@ -21,24 +21,21 @@
 #error "Requires Lua 5.3 or later."
 #endif
 
-#include <haproxy/applet.h>
-#include <haproxy/api.h>
 #include <import/ebpttree.h>
 
+#include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/http_htx.h>
-#include <haproxy/thread.h>
-#include <haproxy/regex.h>
-#include <haproxy/xref.h>
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
 #include <haproxy/map.h>
@@ -46,6 +43,7 @@
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
 #include <haproxy/proxy-t.h>
+#include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/server-t.h>
 #include <haproxy/session.h>
@@ -54,8 +52,11 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
 #include <haproxy/tools.h>
 #include <haproxy/vars.h>
+#include <haproxy/xref.h>
+
 
 /* Lua uses longjmp to perform yield or throwing errors. This
  * macro is used only for identifying the function that can

src/hlua_fcn.c

@@ -28,9 +28,8 @@
 #include <haproxy/regex.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
-#include <haproxy/time.h>
-
 #include <haproxy/stick_table.h>
+#include <haproxy/time.h>
 
 /* Contains the class reference of the concat object. */
 static int class_concat_ref;

src/hpack-dec.c

@@ -30,13 +30,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/tools.h>
+#include <import/ist.h>
+#include <haproxy/chunk.h>
+#include <haproxy/h2.h>
 #include <haproxy/hpack-dec.h>
 #include <haproxy/hpack-huff.h>
 #include <haproxy/hpack-tbl.h>
-#include <haproxy/chunk.h>
-#include <haproxy/h2.h>
-#include <import/ist.h>
+#include <haproxy/tools.h>
 
 
 #if defined(DEBUG_HPACK)

src/hpack-enc.c

@@ -30,9 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
 #include <haproxy/hpack-enc.h>
 #include <haproxy/http-hdr-t.h>
-#include <import/ist.h>
 
 /*
  * HPACK encoding: these tables were generated using gen-enc.c

src/hpack-tbl.c

@@ -30,9 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
 #include <haproxy/hpack-huff.h>
 #include <haproxy/hpack-tbl.h>
-#include <import/ist.h>
 
 /* static header table as in RFC7541 Appendix A. [0] unused. */
 const struct http_hdr hpack_sht[HPACK_SHT_SIZE] = {