REORG: include: update all files to use haproxy/api.h or api-t.h if needed

All files that were including one of the following include files have
been updated to only include haproxy/api.h or haproxy/api-t.h once instead:

  - common/config.h
  - common/compat.h
  - common/compiler.h
  - common/defaults.h
  - common/initcall.h
  - common/tools.h

The choice is simple: if the file only requires type definitions, it includes
api-t.h, otherwise it includes the full api.h.

In addition, in these files, explicit includes for inttypes.h and limits.h
were dropped since these are now covered by api.h and api-t.h.

No other change was performed, given that this patch is large and
affects 201 files. At least one (tools.h) was already freestanding and
didn't get the new one added.

contrib/mod_defender/defender.c

@@ -15,11 +15,10 @@
  * 3 of the License, or (at your option) any later version.
  *
  */
-#include <limits.h>
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <common/defaults.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/chunk.h>
 #include <common/time.h>

contrib/prometheus-exporter/service-prometheus.c

@@ -13,11 +13,10 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/buffer.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 

include/common/base64.h

@@ -14,7 +14,7 @@
 #ifndef _COMMON_BASE64_H
 #define _COMMON_BASE64_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 
 int a2base64(char *in, int ilen, char *out, int olen);
 int base64dec(const char *in, size_t ilen, char *out, size_t olen);

include/common/buffer.h

@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <haproxy/api.h>
 #include <common/buf.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/istbuf.h>
 #include <common/memory.h>

include/common/cfgparse.h

@@ -22,9 +22,7 @@
 #ifndef _COMMON_CFGPARSE_H
 #define _COMMON_CFGPARSE_H
 
-#include <common/compat.h>
-#include <common/config.h>
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <common/mini-clist.h>
 
 #include <proto/log.h>

include/common/chunk.h

@@ -25,8 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <haproxy/api.h>
 #include <common/buf.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/memory.h>
 

include/common/config.h

@@ -22,8 +22,6 @@
 #ifndef _COMMON_CONFIG_H
 #define _COMMON_CONFIG_H
 
-#include <common/compiler.h>
-#include <common/compat.h>
-#include <common/defaults.h>
+#include <haproxy/api.h>
 
 #endif /* _COMMON_CONFIG_H */

include/common/debug.h

@@ -22,7 +22,7 @@
 #ifndef _COMMON_DEBUG_H
 #define _COMMON_DEBUG_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 
 #ifdef DEBUG_FULL

include/common/fcgi.h

@@ -22,9 +22,8 @@
 #ifndef _COMMON_FCGI_H
 #define _COMMON_FCGI_H
 
-#include <inttypes.h>
 #include <stdio.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/buf.h>
 #include <common/ist.h>

include/common/h1.h

@@ -22,9 +22,8 @@
 #ifndef _COMMON_H1_H
 #define _COMMON_H1_H
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/compiler.h>
-#include <common/config.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
 #include <common/ist.h>

include/common/h2.h

@@ -29,7 +29,7 @@
 #ifndef _COMMON_H2_H
 #define _COMMON_H2_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/http-hdr.h>
 #include <common/htx.h>
 #include <common/ist.h>

include/common/hathreads.h

@@ -27,9 +27,8 @@
 #ifdef _POSIX_PRIORITY_SCHEDULING
 #include <sched.h>
 #endif
+#include <haproxy/api.h>
 
-#include <common/config.h>
-#include <common/initcall.h>
 
 /* Note about all_threads_mask :
  *    - this variable is comprised between 1 and LONGBITS.

include/common/hpack-dec.h

@@ -28,9 +28,8 @@
 #ifndef _COMMON_HPACK_DEC_H
 #define _COMMON_HPACK_DEC_H
 
-#include <inttypes.h>
+#include <haproxy/api.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/hpack-tbl.h>
 
 int hpack_decode_frame(struct hpack_dht *dht, const uint8_t *raw, uint32_t len,

include/common/hpack-enc.h

@@ -28,10 +28,9 @@
 #ifndef _COMMON_HPACK_ENC_H
 #define _COMMON_HPACK_ENC_H
 
-#include <inttypes.h>
 #include <string.h>
+#include <haproxy/api.h>
 #include <common/buf.h>
-#include <common/config.h>
 #include <common/http.h>
 #include <common/ist.h>
 

include/common/hpack-tbl.h

@@ -27,9 +27,8 @@
 #ifndef _COMMON_HPACK_TBL_H
 #define _COMMON_HPACK_TBL_H
 
-#include <inttypes.h>
 #include <stdlib.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/http-hdr.h>
 #include <common/ist.h>
 #include <common/memory.h>

include/common/htx.h

@@ -23,8 +23,8 @@
 #define _COMMON_HTX_H
 
 #include <stdio.h>
+#include <haproxy/api.h>
 #include <common/buf.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/http.h>
 #include <common/http-hdr.h>

include/common/ist.h

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #endif
 
-#include <common/config.h>
+#include <haproxy/api.h>
 
 /* ASCII to lower case conversion table */
 #define _IST_LC ((const unsigned char[256]){            \

include/common/memory.h

@@ -26,13 +26,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 #include <unistd.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 
 /* On architectures supporting threads and double-word CAS, we can implement
  * lock-less memory pools. This isn't supported for debugging modes however.

include/common/mini-clist.h

@@ -22,7 +22,6 @@
 #ifndef _COMMON_MINI_CLIST_H
 #define _COMMON_MINI_CLIST_H
 
-#include <common/config.h>
 
 /* these are circular or bidirectionnal lists only. Each list pointer points to
  * another list pointer in a structure, and not the structure itself. The
@@ -258,6 +257,7 @@ struct cond_wordlist {
 	     &item->member != (list_head);                               \
 	     item = back, back = LIST_ELEM(back->member.p, typeof(back), member))
 
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #define MT_LIST_BUSY ((struct mt_list *)1)
 

include/common/net_helper.h

@@ -27,7 +27,7 @@
 #ifndef _COMMON_NET_HELPER_H
 #define _COMMON_NET_HELPER_H
 
-#include <common/compiler.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <arpa/inet.h>
 

include/common/regex.h

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 
 #ifdef USE_PCRE

include/common/standard.h

@@ -27,7 +27,6 @@
 #include <execinfo.h>
 #endif
 
-#include <limits.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
@@ -38,8 +37,8 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <haproxy/api.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/namespace.h>
 #include <import/eb32tree.h>
 #include <import/eb32sctree.h>

include/common/template.h

@@ -22,7 +22,7 @@
 #ifndef _COMMON_TEMPLATE_H
 #define _COMMON_TEMPLATE_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 
 #endif /* _COMMON_TEMPLATE_H */
 

include/common/ticks.h

@@ -52,7 +52,7 @@
 #ifndef _COMMON_TICKS_H
 #define _COMMON_TICKS_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 
 #define TICK_ETERNITY   0

include/common/time.h

@@ -22,11 +22,10 @@
 #ifndef _COMMON_TIME_H
 #define _COMMON_TIME_H
 
-#include <inttypes.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/standard.h>
 

include/common/tools.h

@@ -23,7 +23,6 @@
 #define _COMMON_TOOLS_H
 
 #include <sys/param.h>
-#include <common/config.h>
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))

include/common/uri_auth.h

@@ -13,8 +13,8 @@
 #ifndef _COMMON_URI_AUTH_H
 #define _COMMON_URI_AUTH_H
 
-#include <common/config.h>
 
+#include <haproxy/api.h>
 #include <types/auth.h>
 
 /* This is a list of proxies we are allowed to see. Later, it should go in the

include/common/version.h

@@ -22,7 +22,7 @@
 #ifndef _COMMON_VERSION_H
 #define _COMMON_VERSION_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 
 #ifdef  CONFIG_PRODUCT_NAME
 #define PRODUCT_NAME    CONFIG_PRODUCT_NAME

include/import/ebtree.h

@@ -247,7 +247,7 @@
 #define _EBTREE_H
 
 #include <stdlib.h>
-#include <common/compiler.h>
+#include <haproxy/api.h>
 
 static inline int flsnz8_generic(unsigned int x)
 {

include/proto/acl.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_ACL_H
 #define _PROTO_ACL_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/acl.h>
 #include <proto/sample.h>
 

include/proto/activity.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_ACTIVITY_H
 #define _PROTO_ACTIVITY_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/time.h>
 #include <types/activity.h>

include/proto/applet.h

@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <types/applet.h>

include/proto/auth.h

@@ -13,7 +13,7 @@
 #ifndef _PROTO_AUTH_H
 #define _PROTO_AUTH_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/auth.h>
 
 extern struct userlist *userlist;

include/proto/backend.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_BACKEND_H
 #define _PROTO_BACKEND_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/time.h>
 
 #include <types/backend.h>

include/proto/channel.h

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/chunk.h>
 #include <common/htx.h>
 #include <common/ticks.h>

include/proto/connection.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_CONNECTION_H
 #define _PROTO_CONNECTION_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/ist.h>
 #include <common/memory.h>
 #include <types/connection.h>

include/proto/fd.h

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/ticks.h>
 #include <common/time.h>
 #include <types/fd.h>

include/proto/freq_ctr.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_FREQ_CTR_H
 #define _PROTO_FREQ_CTR_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <common/hathreads.h>

include/proto/frontend.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_FRONTEND_H
 #define _PROTO_FRONTEND_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/stream.h>
 
 int frontend_accept(struct stream *s);

include/proto/http_ana.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_PROTO_HTTP_H
 #define _PROTO_PROTO_HTTP_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/htx.h>
 #include <types/channel.h>
 #include <types/http_ana.h>

include/proto/http_fetch.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_HTTP_FETCH_H
 #define _PROTO_HTTP_FETCH_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/htx.h>
 #include <types/arg.h>
 #include <types/channel.h>

include/proto/http_rules.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_HTTP_RULES_H
 #define _PROTO_HTTP_RULES_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/mini-clist.h>
 #include <types/action.h>
 #include <types/proxy.h>

include/proto/lb_chash.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_LB_CHASH_H
 #define _PROTO_LB_CHASH_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/proxy.h>
 #include <types/server.h>
 

include/proto/lb_fas.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_LB_FAS_H
 #define _PROTO_LB_FAS_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/proxy.h>
 #include <types/server.h>
 

include/proto/lb_fwlc.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_LB_FWLC_H
 #define _PROTO_LB_FWLC_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/proxy.h>
 #include <types/server.h>
 

include/proto/lb_fwrr.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_LB_FWRR_H
 #define _PROTO_LB_FWRR_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/proxy.h>
 #include <types/server.h>
 

include/proto/lb_map.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_LB_MAP_H
 #define _PROTO_LB_MAP_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/proxy.h>
 #include <types/server.h>
 

include/proto/log.h

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <syslog.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/hathreads.h>
 

include/proto/mux_pt.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_MUX_PT_H
 #define _PROTO_MUX_PT_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/connection.h>
 
 extern const struct mux_ops mux_pt_ops;

include/proto/obj_type.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_OBJ_TYPE_H
 #define _PROTO_OBJ_TYPE_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <types/applet.h>
 #include <types/connection.h>

include/proto/pattern.h

@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <types/pattern.h>
 

include/proto/payload.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_PROTO_PAYLOAD_H
 #define _PROTO_PROTO_PAYLOAD_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/sample.h>
 #include <types/stream.h>
 

include/proto/peers.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_PEERS_H
 #define _PROTO_PEERS_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/ticks.h>
 #include <common/time.h>
 #include <proto/connection.h>

include/proto/pipe.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_PIPE_H
 #define _PROTO_PIPE_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/pipe.h>
 
 extern int pipes_used;	/* # of pipes in use (2 fds each) */

include/proto/proto_tcp.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_PROTO_TCP_H
 #define _PROTO_PROTO_TCP_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/action.h>
 #include <types/task.h>
 #include <proto/stick_table.h>

include/proto/proxy.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_PROXY_H
 #define _PROTO_PROXY_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/ticks.h>
 #include <common/time.h>
 #include <types/applet.h>

include/proto/queue.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_QUEUE_H
 #define _PROTO_QUEUE_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 

include/proto/server.h

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/time.h>
 #include <types/applet.h>
 #include <types/dns.h>

include/proto/session.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_SESSION_H
 #define _PROTO_SESSION_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/buffer.h>
 #include <common/debug.h>
 #include <common/memory.h>

include/proto/stats.h

@@ -23,7 +23,7 @@
 #ifndef _PROTO_STATS_H
 #define _PROTO_STATS_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/applet.h>
 #include <types/stream_interface.h>
 #include <types/stats.h>

include/proto/stream.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_STREAM_H
 #define _PROTO_STREAM_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <types/action.h>
 #include <types/stream.h>

include/proto/stream_interface.h

@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/stream.h>
 #include <types/stream_interface.h>
 #include <proto/applet.h>

include/proto/task.h

@@ -25,7 +25,7 @@
 
 #include <sys/time.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

include/proto/tcp_rules.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_TCP_RULES_H
 #define _PROTO_TCP_RULES_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/action.h>
 #include <types/task.h>
 #include <proto/stick_table.h>

include/proto/template.h

@@ -22,7 +22,7 @@
 #ifndef _PROTO_TEMPLATE_H
 #define _PROTO_TEMPLATE_H
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <types/template.h>
 
 

include/proto/trace.h

@@ -22,9 +22,8 @@
 #ifndef _PROTO_TRACE_H
 #define _PROTO_TRACE_H
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/mini-clist.h>
 #include <types/log.h>

include/types/acl.h

@@ -22,8 +22,7 @@
 #ifndef _TYPES_ACL_H
 #define _TYPES_ACL_H
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 
 #include <types/arg.h>

include/types/activity.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_ACTIVITY_H
 #define _TYPES_ACTIVITY_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <types/freq_ctr.h>
 
 /* per-thread activity reports. It's important that it's aligned on cache lines

include/types/applet.h

@@ -22,6 +22,7 @@
 #ifndef _TYPES_APPLET_H
 #define _TYPES_APPLET_H
 
+#include <haproxy/api-t.h>
 #include <types/freq_ctr.h>
 #include <types/hlua.h>
 #include <types/obj_type.h>
@@ -29,7 +30,6 @@
 #include <types/stream.h>
 #include <common/buffer.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/xref.h>
 
 struct appctx;

include/types/auth.h

@@ -13,7 +13,7 @@
 #ifndef _TYPES_AUTH_H
 #define _TYPES_AUTH_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 
 #include <types/auth.h>

include/types/backend.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_BACKEND_H
 #define _TYPES_BACKEND_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/hathreads.h>
 
 #include <types/lb_chash.h>

include/types/capture.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_CAPTURE_H
 #define _TYPES_CAPTURE_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/memory.h>
 
 struct cap_hdr {

include/types/channel.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_CHANNEL_H
 #define _TYPES_CHANNEL_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/buffer.h>
 
 /* The CF_* macros designate Channel Flags, which may be ORed in the bit field

include/types/checks.h

@@ -13,10 +13,10 @@
 #ifndef _TYPES_CHECKS_H
 #define _TYPES_CHECKS_H
 
+#include <haproxy/api-t.h>
 #include <import/ebpttree.h>
 
 #include <common/standard.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>

include/types/connection.h

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <sys/socket.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/ist.h>
 
 #include <types/listener.h>

include/types/fcgi-app.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_HTTP_FCGI_H
 #define _TYPES_HTTP_FCGI_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/ist.h>
 #include <common/fcgi.h>
 #include <common/mini-clist.h>

include/types/fd.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_FD_H
 #define _TYPES_FD_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/hathreads.h>
 #include <common/ist.h>
 #include <types/port_range.h>

include/types/filters.h

@@ -21,7 +21,7 @@
 #ifndef _TYPES_FILTERS_H
 #define _TYPES_FILTERS_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 
 struct http_msg;

include/types/freq_ctr.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_FREQ_CTR_H
 #define _TYPES_FREQ_CTR_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 
 /* The implicit freq_ctr counter counts a rate of events per second. It is the
  * preferred form to count rates over a one-second period, because it does not

include/types/global.h

@@ -24,8 +24,7 @@
 
 #include <netinet/in.h>
 
-#include <common/config.h>
-#include <common/initcall.h>
+#include <haproxy/api-t.h>
 #include <common/hathreads.h>
 
 #include <types/freq_ctr.h>

include/types/http_ana.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_PROTO_HTTP_H
 #define _TYPES_PROTO_HTTP_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/http.h>
 
 #include <types/channel.h>

include/types/lb_chash.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_LB_CHASH_H
 #define _TYPES_LB_CHASH_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 #include <import/eb32tree.h>
 

include/types/lb_fas.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_LB_FAS_H
 #define _TYPES_LB_FAS_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 
 struct lb_fas {

include/types/lb_fwlc.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_LB_FWLC_H
 #define _TYPES_LB_FWLC_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 
 struct lb_fwlc {

include/types/lb_fwrr.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_LB_FWRR_H
 #define _TYPES_LB_FWRR_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 
 /* This structure is used to apply fast weighted round robin on a server group */

include/types/lb_map.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_LB_MAP_H
 #define _TYPES_LB_MAP_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <types/server.h>
 
 struct lb_map {

include/types/listener.h

@@ -26,10 +26,10 @@
 #include <sys/socket.h>
 
 #ifdef USE_OPENSSL
+#include <haproxy/api-t.h>
 #include <common/openssl-compat.h>
 #endif
 
-#include <common/config.h>
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
 

include/types/log.h

@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/hathreads.h>
 #include <common/mini-clist.h>
 #include <types/ring.h>

include/types/pattern.h

@@ -22,8 +22,7 @@
 #ifndef _TYPES_PATTERN_H
 #define _TYPES_PATTERN_H
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
 

include/types/peers.h

@@ -27,10 +27,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
-#include <common/tools.h>
 #include <import/eb32tree.h>
 
 #include <types/dict.h>

include/types/pipe.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_PIPE_H
 #define _TYPES_PIPE_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 
 /* A pipe is described by its read and write FDs, and the data remaining in it.
  * The FDs are valid if there are data pending. The user is not allowed to

include/types/protocol.h

@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <import/eb32tree.h>
 

include/types/proxy.h

@@ -27,12 +27,11 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/api-t.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/http.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
-#include <common/tools.h>
 #include <common/hathreads.h>
 
 #include <import/eb32tree.h>

include/types/queue.h

@@ -22,7 +22,7 @@
 #ifndef _TYPES_QUEUE_H
 #define _TYPES_QUEUE_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
 

include/types/ring.h

@@ -22,9 +22,8 @@
 #ifndef _TYPES_RING_H
 #define _TYPES_RING_H
 
+#include <haproxy/api-t.h>
 #include <common/buf.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/ist.h>
 
 /* The code below handles circular buffers with single-producer and multiple

include/types/server.h

@@ -25,7 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
 #include <common/openssl-compat.h>

include/types/session.h

@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 
 #include <types/obj_type.h>

include/types/signal.h

@@ -16,7 +16,7 @@
 
 
 #include <signal.h>
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 

include/types/sink.h

@@ -22,9 +22,8 @@
 #ifndef _TYPES_SINK_H
 #define _TYPES_SINK_H
 
+#include <haproxy/api-t.h>
 #include <common/buffer.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/ist.h>
 
 /* A sink may be of 4 distinct types :

include/types/stream.h

@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 
 #include <types/channel.h>