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.

diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index 03f12a2727db8b9a487b75845e187d873d2f45c4..b552a7c717e636329e6299571da1a46f374fdfd4 100644 (file)
--- a/contrib/mod_defender/defender.c
+++ b/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>

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index dfd5e1a43c3e34593f4ae5c45e595fb797850ce5..a31aa153ce04e2cbb204db5da847884936f83c51 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/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>
 

diff --git a/include/common/base64.h b/include/common/base64.h
index 2f52ac7453e9054359378e435544d6e158128161..e53a3528be07cd7894b1200502ae551f61e68edf 100644 (file)
--- a/include/common/base64.h
+++ b/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);

diff --git a/include/common/buffer.h b/include/common/buffer.h
index 779186f6057da41006b6d5a2c55039d27fec77a0..f7aa2542f9038bff6b63a5534fbe6037935c9b65 100644 (file)
--- a/include/common/buffer.h
+++ b/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>

diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h
index 1a288166aa2525975aef292b2aa4770f4d5c6a6b..8ecb7714a21e38384cf1ddb8c99e80b8987da24e 100644 (file)
--- a/include/common/cfgparse.h
+++ b/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>

diff --git a/include/common/chunk.h b/include/common/chunk.h
index a061a344284955a0769d721d6e8c4cff2e9dd101..ae7ae853842d9971c04d70867b481468ee03a6f8 100644 (file)
--- a/include/common/chunk.h
+++ b/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>
 

diff --git a/include/common/config.h b/include/common/config.h
index 30da555e1bafeb82b5ee281028630f946e2f34c5..49d219cdaea0cff25c4d9ba85306926b77e22719 100644 (file)
--- a/include/common/config.h
+++ b/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 */

diff --git a/include/common/debug.h b/include/common/debug.h
index c6c154cde78d7884f6c26fe1a52620438e8bf947..c234bdc7079fcf9fd87933548a35cd842c126b6d 100644 (file)
--- a/include/common/debug.h
+++ b/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

diff --git a/include/common/fcgi.h b/include/common/fcgi.h
index d85e118f3741641e54bf679b51b747bf65019b2d..b9a752b92c6b3da73f03d2eceb0d1aaacdf5d5af 100644 (file)
--- a/include/common/fcgi.h
+++ b/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>

diff --git a/include/common/h1.h b/include/common/h1.h
index fc28b4808cf93e7c34449f14a5a5fdf79b7bebb6..0bc0f4864b471080f1ed998a6c7afa831214b0b2 100644 (file)
--- a/include/common/h1.h
+++ b/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>

diff --git a/include/common/h2.h b/include/common/h2.h
index 03582992a4e57f79e28cc00a4b9ef59a10f597ee..5654a76111bcdac8c48ecc1e6c1587e487c8f6f0 100644 (file)
--- a/include/common/h2.h
+++ b/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>

diff --git a/include/common/hathreads.h b/include/common/hathreads.h
index 45ec1d2e06f0d7af6bb1ee887bce4b2fd5a95a1e..e25dfc8fc8b89551fa9b3d6faab320808e120c26 100644 (file)
--- a/include/common/hathreads.h
+++ b/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.

diff --git a/include/common/hpack-dec.h b/include/common/hpack-dec.h
index 39d1bf0a07210eb2bf04910ff516c72733b94460..f538332be9a5cfeef1f0238ea070c4395c132610 100644 (file)
--- a/include/common/hpack-dec.h
+++ b/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,

diff --git a/include/common/hpack-enc.h b/include/common/hpack-enc.h
index 555dba810edadbb78e36db8d29789be6af429b60..f204853d732684e368234af4fc419ec6a8ce5e3d 100644 (file)
--- a/include/common/hpack-enc.h
+++ b/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>
 

diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h
index 6d529f20fc7ae95ecb8895eea74287b87f28c7c1..cde7114af8bca6ec3117955a14214ea95f3b118d 100644 (file)
--- a/include/common/hpack-tbl.h
+++ b/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>

diff --git a/include/common/htx.h b/include/common/htx.h
index 3d54c4a0fcb0317ac51666f7b748f969da5bafff..5a13614f344ca3989d4ab77a7fd8ad0ab2992300 100644 (file)
--- a/include/common/htx.h
+++ b/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>

diff --git a/include/common/ist.h b/include/common/ist.h
index 8dd6615ed50104e61c0cfe1a88e86fea3b57d720..d62924e167fa6d6add24ce43fd14ae4edf241e1b 100644 (file)
--- a/include/common/ist.h
+++ b/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]){            \

diff --git a/include/common/memory.h b/include/common/memory.h
index d3950ca5df2c739d9bbcc68628e3e4462733ace2..8b03daf8e1ba619f96c9a54c73b8cb15fc260462 100644 (file)
--- a/include/common/memory.h
+++ b/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.

diff --git a/include/common/mini-clist.h b/include/common/mini-clist.h
index 5d3954cd41a1ac0e40f680117648b16bd0ade1aa..188d118ac890e140267288466395ad8d535869dd 100644 (file)
--- a/include/common/mini-clist.h
+++ b/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)
 

diff --git a/include/common/net_helper.h b/include/common/net_helper.h
index 0443fe1f905fd62330c3bd822986f1d39f09b498..8fdf12088f51dc9c236c4802d3f29ea33879297e 100644 (file)
--- a/include/common/net_helper.h
+++ b/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>
 

diff --git a/include/common/regex.h b/include/common/regex.h
index cecfbd93c033e8bfa08e94d5c2d68f1f20dce065..d106b8690fc96dd062f42782608936f4ec5e5e4d 100644 (file)
--- a/include/common/regex.h
+++ b/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

diff --git a/include/common/standard.h b/include/common/standard.h
index 3f6f95438d39c1d99b8608d52a9852378b5cca4b..fdbfc48a9cd916367005e69fed2242e8824fcf35 100644 (file)
--- a/include/common/standard.h
+++ b/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>

diff --git a/include/common/template.h b/include/common/template.h
index c9e48bfa1e5d83f04dcb43b53ecb94812606f2d0..beb714ddb9b58f19f6c74303a6ebfba4a8c34c1e 100644 (file)
--- a/include/common/template.h
+++ b/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 */
 

diff --git a/include/common/ticks.h b/include/common/ticks.h
index de29b315a1480aed17bf199b4753a81d0b021c27..807b323dfed7b6991d03806fa6a2b18f66c4a20b 100644 (file)
--- a/include/common/ticks.h
+++ b/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

diff --git a/include/common/time.h b/include/common/time.h
index e59ed5e6e9c3317b0d2c09c8bde5b9ebb077588c..2a4ec0afc6357359039a9b72d64646cf472aeda0 100644 (file)
--- a/include/common/time.h
+++ b/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>
 

diff --git a/include/common/tools.h b/include/common/tools.h
index 9610601094db6fc92207f2e1b5d73ebb28432350..c7c0c8869253117f98e2fbf96b081582cf0a0e0e 100644 (file)
--- a/include/common/tools.h
+++ b/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))

diff --git a/include/common/uri_auth.h b/include/common/uri_auth.h
index 8223dc1030d3b40bc8d2e19ec6bc071e56829a3a..33596534e4ad2b2c6224575123d34580351a0090 100644 (file)
--- a/include/common/uri_auth.h
+++ 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

diff --git a/include/common/version.h b/include/common/version.h
index 7eba4a3c0a00ea4f871f50d0898c1c7156a99d14..b38104f288977604f9c4630028ff6ba634c34921 100644 (file)
--- a/include/common/version.h
+++ b/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

diff --git a/include/import/ebtree.h b/include/import/ebtree.h
index 9e5daca48a02b81dbb16188f5fd606d06ea1cd4c..73ca6d5fb278f1257c1a206497150294aa089d33 100644 (file)
--- a/include/import/ebtree.h
+++ b/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)
 {

diff --git a/include/proto/acl.h b/include/proto/acl.h
index dd6dae5073f3f17612d116a1bf632c0cefb63352..28b49c448e1a6ced5db2b0d615abb48d43b9f8b0 100644 (file)
--- a/include/proto/acl.h
+++ b/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>
 

diff --git a/include/proto/activity.h b/include/proto/activity.h
index 673d274578db4d01cd35f3f6dc063f5bc121a890..26365ca8bde3c0ffdaedba42fb90228c30dc80bd 100644 (file)
--- a/include/proto/activity.h
+++ b/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>

diff --git a/include/proto/applet.h b/include/proto/applet.h
index 14fbca2a12c866fede9747bc1ca16de4ef94655a..ea8bc0baf40998e4669e365157fc1fa4815094aa 100644 (file)
--- a/include/proto/applet.h
+++ b/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>

diff --git a/include/proto/auth.h b/include/proto/auth.h
index eea5df54c919ecb73ac94c64a14153666100ae0b..853e38cbbacf47524fbd5330bd983aa84052cafb 100644 (file)
--- a/include/proto/auth.h
+++ b/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;

diff --git a/include/proto/backend.h b/include/proto/backend.h
index 5764c133c1295d8c2d39020abf0cac6c3335eb7c..516049286f728ea2b09541b14a56afaf066e7e23 100644 (file)
--- a/include/proto/backend.h
+++ b/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>

diff --git a/include/proto/channel.h b/include/proto/channel.h
index 175d311e7102436be31609803e9f8456ff2b6cca..16954bac05ee8e46c84d34ae390f0e72f8cac62a 100644 (file)
--- a/include/proto/channel.h
+++ b/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>

diff --git a/include/proto/connection.h b/include/proto/connection.h
index 86294388c114cb9818114e1fffa744189d522640..9b1e3d871c2115d03811764bee0d652750d8c94e 100644 (file)
--- a/include/proto/connection.h
+++ b/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>

diff --git a/include/proto/fd.h b/include/proto/fd.h
index 88484371910091cd764a961386fc14fe6020ad0b..a3c476d079906feeeab2a4cb627bf7cd912b6291 100644 (file)
--- a/include/proto/fd.h
+++ b/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>

diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h
index 63febb24a73d8f34746e432bda2ece753042b3c2..7413803ef0be0631e5e0d8e2262ccd4e7cf971ee 100644 (file)
--- a/include/proto/freq_ctr.h
+++ b/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>

diff --git a/include/proto/frontend.h b/include/proto/frontend.h
index 61d04090668c12afdd4620a05df10e14a61a5ef1..37d484cf964841e699e4b3ec7bcbaa79b73d002f 100644 (file)
--- a/include/proto/frontend.h
+++ b/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);

diff --git a/include/proto/http_ana.h b/include/proto/http_ana.h
index 894357688e1910f09c450d8a8ce76b561dbb38b7..cdfa87e1ecd52b90c17369fd3f7e10ff70f24af2 100644 (file)
--- a/include/proto/http_ana.h
+++ b/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>

diff --git a/include/proto/http_fetch.h b/include/proto/http_fetch.h
index 562e703c0af52682a7e11b7ab0d1df3aba221e91..22c793fb07be7e23d739a91a0d7e4eb8751cb3ef 100644 (file)
--- a/include/proto/http_fetch.h
+++ b/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>

diff --git a/include/proto/http_rules.h b/include/proto/http_rules.h
index 3e57b9d4aad67fd8736f2aa2aa0390c8d57cc3b1..27c4b6a8fdd9c564fd48b97f3d71168f1a1a6bfb 100644 (file)
--- a/include/proto/http_rules.h
+++ b/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>

diff --git a/include/proto/lb_chash.h b/include/proto/lb_chash.h
index 679dff3638792f36793ee22891516c089d95b9ab..0a44967f37317bc294d39717faf876409d73597b 100644 (file)
--- a/include/proto/lb_chash.h
+++ b/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>
 

diff --git a/include/proto/lb_fas.h b/include/proto/lb_fas.h
index 602c4f68e0de3d6ec5741d3b8c4d250e129f97c8..4e1f02d1eff6494d7576b48323c2e0e6ee4c77f2 100644 (file)
--- a/include/proto/lb_fas.h
+++ b/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>
 

diff --git a/include/proto/lb_fwlc.h b/include/proto/lb_fwlc.h
index 8c56746565800cff5365605a43346881bf9b41ba..a7a46fff7907aa98abd3cc80977fcbbe226a4d5e 100644 (file)
--- a/include/proto/lb_fwlc.h
+++ b/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>
 

diff --git a/include/proto/lb_fwrr.h b/include/proto/lb_fwrr.h
index 1189c3888add20fe75e75c0fdcfd0a5df03f03bc..c23a4710b8fcd58ee2bc6ec2cfbf119bb119c70d 100644 (file)
--- a/include/proto/lb_fwrr.h
+++ b/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>
 

diff --git a/include/proto/lb_map.h b/include/proto/lb_map.h
index cf7349ef4d5ef0b7f8cc2e1ed2cffd584a844f88..0dc089bc7ed161936eacb52dbde146c90e2bc3bf 100644 (file)
--- a/include/proto/lb_map.h
+++ b/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>
 

diff --git a/include/proto/log.h b/include/proto/log.h
index 6e342e3c9f3ed200bb1cba57fd9fa41e8bc98c0d..a84d61263f9b7b95425d0fe925407aac2ddc8c6f 100644 (file)
--- a/include/proto/log.h
+++ b/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>
 

diff --git a/include/proto/mux_pt.h b/include/proto/mux_pt.h
index 33c4e32632251d4e8c72a738d4381735602222de..d61305ace7851b70431818960ebbfa563041c1ee 100644 (file)
--- a/include/proto/mux_pt.h
+++ b/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;

diff --git a/include/proto/obj_type.h b/include/proto/obj_type.h
index 799732b279bd533e1dcde58084481b18e7049788..f4816b13730556ffd709f3bcb75ad95632186d3f 100644 (file)
--- a/include/proto/obj_type.h
+++ b/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>

diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index 39514b1d8d9f44bf1bd73cf0c9ac2e6fdf212a8f..2d51d95ad35d51ca8e4e510b37ba81f5ce7c281f 100644 (file)
--- a/include/proto/pattern.h
+++ b/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>
 

diff --git a/include/proto/payload.h b/include/proto/payload.h
index 9674832fa18f0e1b36ed5bcee9d23ec18235ceea..481b613b2aba3b7bd10e8373b7ff4c29af158b39 100644 (file)
--- a/include/proto/payload.h
+++ b/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>
 

diff --git a/include/proto/peers.h b/include/proto/peers.h
index 74e20dadc1beb98bd10bce5a3da4811320003857..fbe6cf6a66d9a95f59416bba2422fe4d93a93f69 100644 (file)
--- a/include/proto/peers.h
+++ b/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>

diff --git a/include/proto/pipe.h b/include/proto/pipe.h
index 0c0216586c5b6247dea5e391b954f5596684ab64..4dd3dd6402f8ec3657dff9ff7e37ca8c3c0cdb15 100644 (file)
--- a/include/proto/pipe.h
+++ b/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) */

diff --git a/include/proto/proto_tcp.h b/include/proto/proto_tcp.h
index daac1d836a9f70f16d9acf0f8cb5ff5f7a89b6bf..347305bf32c8d3023f4b2c79ba47959a1aa11548 100644 (file)
--- a/include/proto/proto_tcp.h
+++ b/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>

diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index db4cb89619dce2c428063733e9ab221da7bb358c..630a0112e850fd17ac7f75104fb6964d8b2dfd5d 100644 (file)
--- a/include/proto/proxy.h
+++ b/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>

diff --git a/include/proto/queue.h b/include/proto/queue.h
index a7ab63b35e27ea3f4e39f80a44957662dab86a59..8ef9179e696c8eefff63035c1d390938e6be620a 100644 (file)
--- a/include/proto/queue.h
+++ b/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>
 

diff --git a/include/proto/server.h b/include/proto/server.h
index f8fed314884a5fb4ff1228f59640d90c56264cf5..4c4b4bf091f64c99083eecd7262b26d8e0cf60fe 100644 (file)
--- a/include/proto/server.h
+++ b/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>

diff --git a/include/proto/session.h b/include/proto/session.h
index a5b95a8deadf87c5fe76064c1c6b4eac944ccc00..61a7b0020bb48a8335d0be7e6dfa0dffdbf31b0f 100644 (file)
--- a/include/proto/session.h
+++ b/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>

diff --git a/include/proto/stats.h b/include/proto/stats.h
index d20beeab2e70d73d4aea4a4df97784639dec3990..5342e12a055b494fe0e869b8bba0c48d8f96ee59 100644 (file)
--- a/include/proto/stats.h
+++ b/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>

diff --git a/include/proto/stream.h b/include/proto/stream.h
index 69153df5d4640785a10137f52ba08191b8a5aef6..752c183f9af2ac1036c051e7fb84b301348ad2f3 100644 (file)
--- a/include/proto/stream.h
+++ b/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>

diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 490ee5ebfcd85d826dc68f8dcfb28d2fc8f33536..98ccb2833d76bfc4b5e0fee543a53ab8da888ab6 100644 (file)
--- a/include/proto/stream_interface.h
+++ b/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>

diff --git a/include/proto/task.h b/include/proto/task.h
index 52b284d0f7b32751a40d451fa309a84bad7874d0..a42431a1715205d79c67177c7bcd26fd9a9c1bdd 100644 (file)
--- a/include/proto/task.h
+++ b/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>

diff --git a/include/proto/tcp_rules.h b/include/proto/tcp_rules.h
index bf920a104c9fd5a54b3480b958dfc7e2161e8b25..b9a4c932a46c1adcf882dafb1512a8f9efb0d150 100644 (file)
--- a/include/proto/tcp_rules.h
+++ b/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>

diff --git a/include/proto/template.h b/include/proto/template.h
index f7f9e553e114068c1a0446b40dac4424adc4cd23..c6a11c2f9bdbb01538fdc1c1ef40189c3bb1532f 100644 (file)
--- a/include/proto/template.h
+++ b/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>
 
 

diff --git a/include/proto/trace.h b/include/proto/trace.h
index ece23293bdc3e75210afbf8e8ba96bf4339f412b..ef88079b185c24cbca8d7db913414cb846f5f0d0 100644 (file)
--- a/include/proto/trace.h
+++ b/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>

diff --git a/include/types/acl.h b/include/types/acl.h
index f5d385896ab1c29b0115fa582c05c776223b2905..748f3611b8f4f9dc1f4fd5fafe14082d5fbfd08d 100644 (file)
--- a/include/types/acl.h
+++ b/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>

diff --git a/include/types/activity.h b/include/types/activity.h
index 01e484facd2745b804247db3690b5e916b222c3a..312380f288327de9f4b58a71bed710c6e5098c02 100644 (file)
--- a/include/types/activity.h
+++ b/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

diff --git a/include/types/applet.h b/include/types/applet.h
index a4e22e336ba60c3435557909317fcd2fa4707508..aa1bc31ddb2f61d42b359555e1404dc786b531a2 100644 (file)
--- a/include/types/applet.h
+++ b/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;

diff --git a/include/types/auth.h b/include/types/auth.h
index 964f29b6a963875687b64668baaed68e9d711f87..c10aced5b6b6a024b2be6a682161fe79d5ee4989 100644 (file)
--- a/include/types/auth.h
+++ b/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>

diff --git a/include/types/backend.h b/include/types/backend.h
index 22e5f21e68de42cd90973638140e8bebcbef3914..3150ecf1b639ba8b7cd0b8ed6777dc10d411a367 100644 (file)
--- a/include/types/backend.h
+++ b/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>

diff --git a/include/types/capture.h b/include/types/capture.h
index a9ced25c7dfe42d9392e6abb56cbd22946561c43..493d0be2c949ecbe143ce4559cac2a767e26b873 100644 (file)
--- a/include/types/capture.h
+++ b/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 {

diff --git a/include/types/channel.h b/include/types/channel.h
index 4bcc3b954a6bad084023c1237d2aa23b9afec622..863c3fba69767222e3e9e8d7bbe0b09e616416f1 100644 (file)
--- a/include/types/channel.h
+++ b/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

diff --git a/include/types/checks.h b/include/types/checks.h
index a23091cc2d601d60a83beb85d4d59bcf33e3bcfc..b2be640c3cc18144f7b17dab9c516c12cf8b2865 100644 (file)
--- a/include/types/checks.h
+++ b/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>

diff --git a/include/types/connection.h b/include/types/connection.h
index 8780590d850a7d7ef884a035476136efc114994f..7357174dcb1640976c8d692214996cc81f029d45 100644 (file)
--- a/include/types/connection.h
+++ b/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>

diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h
index d7beb2602d6c83000b749f6f4887e91522b42e6a..f0fcdc7aec1ff9c36154dcf9b380169d71d5839a 100644 (file)
--- a/include/types/fcgi-app.h
+++ b/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>

diff --git a/include/types/fd.h b/include/types/fd.h
index 178dea1268d45b4722173df7b9643d1db1ff9509..0041d4d601de4ad3ea17c363bcc743648883b9c5 100644 (file)
--- a/include/types/fd.h
+++ b/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>

diff --git a/include/types/filters.h b/include/types/filters.h
index 1930e2aede1d1b9f5386cce7a0420a531fb6b6dd..5de4eee6e640fb78aa3308aecea0307fe8e83588 100644 (file)
--- a/include/types/filters.h
+++ b/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;

diff --git a/include/types/freq_ctr.h b/include/types/freq_ctr.h
index 425ddf3b84a316b8ca0c7fa216d7096921c33068..3b02cf9080494d2afdfc7ae47c61071dcf6152dc 100644 (file)
--- a/include/types/freq_ctr.h
+++ b/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

diff --git a/include/types/global.h b/include/types/global.h
index 592d288672261a6558fd4cfbb70e7d4f908ab5e1..cb9ff4b24b44f553e4bff1e176813e23f21fcc7f 100644 (file)
--- a/include/types/global.h
+++ b/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>

diff --git a/include/types/http_ana.h b/include/types/http_ana.h
index c17dc18cc729132a01d9054ea7ae1ad93ff243d5..7bade13039caf1a58f68a8e6bb03b6d396cd6a09 100644 (file)
--- a/include/types/http_ana.h
+++ b/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>

diff --git a/include/types/lb_chash.h b/include/types/lb_chash.h
index 9486064dd8679ec9a1740f794feedffecf0d10e3..a57a229ca212197260c575430f3404bef0e963b1 100644 (file)
--- a/include/types/lb_chash.h
+++ b/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>
 

diff --git a/include/types/lb_fas.h b/include/types/lb_fas.h
index e20d70a27998a2f9c94e6c76c15f24dd987ed620..040563e743e81702f6af7528c80c71a3d301fe4c 100644 (file)
--- a/include/types/lb_fas.h
+++ b/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 {

diff --git a/include/types/lb_fwlc.h b/include/types/lb_fwlc.h
index f20659a71a9b503652f901d7c752c6436aa3738d..c87d61ed38b7a7b3b947d3cffad120206ad33b24 100644 (file)
--- a/include/types/lb_fwlc.h
+++ b/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 {

diff --git a/include/types/lb_fwrr.h b/include/types/lb_fwrr.h
index 754d0c64b1298afacee9d4a200549d26729afb68..6a2a04c20536783af4fc517b4c373da49669f83b 100644 (file)
--- a/include/types/lb_fwrr.h
+++ b/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 */

diff --git a/include/types/lb_map.h b/include/types/lb_map.h
index 38e26af64fe0139741c3372d94467bb37bc7f9d4..5409a8152cf4104976833ff84106f8e7da161037 100644 (file)
--- a/include/types/lb_map.h
+++ b/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 {

diff --git a/include/types/listener.h b/include/types/listener.h
index d035a90fc01117fc180ef3e66ccfa193578d5e76..cbd4bab1785c5b856f966997ca91ca2808629171 100644 (file)
--- a/include/types/listener.h
+++ b/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>
 

diff --git a/include/types/log.h b/include/types/log.h
index fb9aa586eaf15ceac9db2fbdd2c7d2c49c408186..2c2ac0298a2823187580c36707ce6306344ded99 100644 (file)
--- a/include/types/log.h
+++ b/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>

diff --git a/include/types/pattern.h b/include/types/pattern.h
index f4c0a1323ceca8eea400223aa2e8fb9529be06c7..f1468b3e2a67dd65050abcaa6c06e8fa586ba761 100644 (file)
--- a/include/types/pattern.h
+++ b/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>
 

diff --git a/include/types/peers.h b/include/types/peers.h
index 78270bf245400d8f23a2385ac272978dff623d1a..74613472a85b88f2b7f4e5a5216c7eeda49f6f9f 100644 (file)
--- a/include/types/peers.h
+++ b/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>

diff --git a/include/types/pipe.h b/include/types/pipe.h
index 12a1eeee98aa4cb4fd444f369a7994e6491a033d..c6460298acfba880ca5af3e07f3b84bca513c7af 100644 (file)
--- a/include/types/pipe.h
+++ b/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

diff --git a/include/types/protocol.h b/include/types/protocol.h
index 10437a7b11a4c043f329e0dfc42f7430b738409d..edda61c0180783c6e679b935f9afa58e96f59d5e 100644 (file)
--- a/include/types/protocol.h
+++ b/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>
 

diff --git a/include/types/proxy.h b/include/types/proxy.h
index a9adce0b57dc0b0d9f3c3f29f5901223ed48794a..c75f0b6795c8e55041b949a94f15b3517c0ef44b 100644 (file)
--- a/include/types/proxy.h
+++ b/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>

diff --git a/include/types/queue.h b/include/types/queue.h
index 361c704d04e83257db669bedf8c16671d503d6c0..b0800f30f741039b275c2551ccd1d33e1c4df2ea 100644 (file)
--- a/include/types/queue.h
+++ b/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>
 

diff --git a/include/types/ring.h b/include/types/ring.h
index 5f0827171190c53057ea6b0228779b4f44d02cf0..ac93c121968035f997b78774775f4b653b2f5c4a 100644 (file)
--- a/include/types/ring.h
+++ b/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

diff --git a/include/types/server.h b/include/types/server.h
index 376fc0321f2e0ab1dc02952981366be2f5d184dd..70a6e82ac1338b956d8992a8efe15d9849378e40 100644 (file)
--- a/include/types/server.h
+++ b/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>

diff --git a/include/types/session.h b/include/types/session.h
index 824799a514b0c68bbbe8bc4cdf8f19eb3f30027d..fb6b6212b5f3f863909011837c1daad9f6448cd0 100644 (file)
--- a/include/types/session.h
+++ b/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>

diff --git a/include/types/signal.h b/include/types/signal.h
index ec3dcf2da18116fd126c8b25f098f88dbf1b4971..661347a0a4a0d5fc1549fcd87ff338209839087a 100644 (file)
--- a/include/types/signal.h
+++ b/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>
 

diff --git a/include/types/sink.h b/include/types/sink.h
index 029c20dfe813ef3e7aeb500e41510f1a63183095..64b0bcaf4d15ff7e02f842655f08662ab1df35d7 100644 (file)
--- a/include/types/sink.h
+++ b/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 :

diff --git a/include/types/stream.h b/include/types/stream.h
index 0dcc541faafc6e88d91922122ec45902f27b1db8..e450c6340e1a21c8d1b354dd15bd8f0a111ab159 100644 (file)
--- a/include/types/stream.h
+++ b/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>

diff --git a/include/types/stream_interface.h b/include/types/stream_interface.h
index e45eb6f1750d0a5aa8cf6ec46f86b53498d5a732..4c69d2dd9a54a8cba37a4850e4765254e36ac7fd 100644 (file)
--- a/include/types/stream_interface.h
+++ b/include/types/stream_interface.h
@@ -22,8 +22,8 @@
 #ifndef _TYPES_STREAM_INTERFACE_H
 #define _TYPES_STREAM_INTERFACE_H
 
+#include <haproxy/api-t.h>
 #include <types/obj_type.h>
-#include <common/config.h>
 
 /* A stream interface must have its own errors independently of the buffer's,
  * so that applications can rely on what the buffer reports while the stream

diff --git a/include/types/task.h b/include/types/task.h
index 0fba89898429bc73f333d49b5d8641061ef5a5ea..01756ead854d308a9cd4113cc9b7dca46efa686a 100644 (file)
--- a/include/types/task.h
+++ b/include/types/task.h
@@ -24,7 +24,7 @@
 
 #include <sys/time.h>
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <import/eb32sctree.h>
 #include <import/eb32tree.h>

diff --git a/include/types/template.h b/include/types/template.h
index e4292e72bad26f3586642e9901e003650c69c5bd..5ef691c35c13cc7ebefd2743c78d5dd8ba6fe9b0 100644 (file)
--- a/include/types/template.h
+++ b/include/types/template.h
@@ -22,7 +22,7 @@
 #ifndef _TYPES_TEMPLATE_H
 #define _TYPES_TEMPLATE_H
 
-#include <common/config.h>
+#include <haproxy/api-t.h>
 
 #endif /* _TYPES_TEMPLATE_H */
 

diff --git a/include/types/trace.h b/include/types/trace.h
index db7b1855062745fb48da5226da0ed4606933e978..cd5e8be15230698d3ffe118a8598bee1e7ba21ab 100644 (file)
--- a/include/types/trace.h
+++ b/include/types/trace.h
@@ -22,9 +22,8 @@
 #ifndef _TYPES_TRACE_H
 #define _TYPES_TRACE_H
 
+#include <haproxy/api-t.h>
 #include <common/buffer.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/mini-clist.h>
 #include <types/sink.h>

diff --git a/src/51d.c b/src/51d.c
index 78ee7483bd290d2d9819de368c8ee707c158edc2..13997e348b8589caa7867ad812a73c508cb329e9 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
 #include <common/buffer.h>
 #include <common/errors.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/http_fetch.h>

diff --git a/src/acl.c b/src/acl.c
index 7df433d4ab84c0b3d47f1479c6e4ab0b5ec571c4..5b25fce5ad90ea321a19483a6d7b3287972aec3c 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -14,8 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <common/config.h>
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/uri_auth.h>

diff --git a/src/action.c b/src/action.c
index dad7472139d0e24033eb768b8ad975914c8ccdf1..0854208132c8f6fa7f900c46c4c6aff81b0f846c 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

diff --git a/src/activity.c b/src/activity.c
index 8844e0c5fa7edd5ae0951d683c23cec0c3b5231d..6da8f40e96643fd97fc65c150f2a1c7cdb17261c 100644 (file)
--- a/src/activity.c
+++ b/src/activity.c
@@ -10,11 +10,10 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/standard.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <types/activity.h>
 #include <proto/channel.h>
 #include <proto/cli.h>

diff --git a/src/applet.c b/src/applet.c
index 60c9e245d73a6c63ec6c96b75fac4820c63ab1ab..5f06d6ac1ec10f3a52c9a1312928b8781592e742 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/mini-clist.h>
 #include <proto/applet.h>
 #include <proto/channel.h>

diff --git a/src/auth.c b/src/auth.c
index 1b0f3767b8b220efbefc175864d24c4dd36b92a2..2d9804433defe5edcaf103c4dc5cc2f4819058c9 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -25,11 +25,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <haproxy/api.h>
 #include <types/global.h>
-#include <common/config.h>
 #include <common/errors.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 
 #include <proto/acl.h>
 #include <proto/log.h>

diff --git a/src/backend.c b/src/backend.c
index ba968198e88122bc1a1ae6c4eb86dda2b9291ee0..f259b391752812bdf943375bd78bac189f7860b5 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -19,13 +19,11 @@
 #include <ctype.h>
 #include <sys/types.h>
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/hash.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/ticks.h>
 #include <common/time.h>
 #include <common/namespace.h>

diff --git a/src/base64.c b/src/base64.c
index e7c9519200d93a0711ea52b8aba4bee543008593..90e4fb85d7d06e34829aa6b360caacfcf241fad0 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <haproxy/api.h>
 #include <common/base64.h>
-#include <common/config.h>
 
 #define B64BASE        '#'             /* arbitrary chosen base value */
 #define B64CMIN        '+'

diff --git a/src/buffer.c b/src/buffer.c
index a7f405bbc3bfcd58a46c73671511b9cbd996332c..c8d7a69f2c1c1cfefcaef8d7140a98e7b79975fe 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/buffer.h>
 #include <common/memory.h>
 

diff --git a/src/cache.c b/src/cache.c
index f68cb14169efefc07e05459cbab33276c397dc50..fac9b7d76caa134307774867cd23d46f4f1f1a2d 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -10,6 +10,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <haproxy/api.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
@@ -35,7 +36,6 @@
 #include <common/cfgparse.h>
 #include <common/hash.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/net_helper.h>
 
 #define CACHE_FLT_F_IMPLICIT_DECL  0x00000001 /* The cache filtre was implicitly declared (ie without

diff --git a/src/calltrace.c b/src/calltrace.c
index 1a03709f4bb788ae8c1f130caa9e1242901a52af..a4f3bbe9f254b43d158eee3c7ecda7d5d2f615dd 100644 (file)
--- a/src/calltrace.c
+++ b/src/calltrace.c
@@ -47,7 +47,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <common/compiler.h>
+#include <haproxy/api.h>
 #include <common/time.h>
 
 static FILE *log;

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 5c3688110f8dd5405de6bfbdf2a427f2f672a306..e6372fb1037f5873cf1c5cee4fc0e155683f8c83 100644 (file)
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -31,9 +31,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/api.h>
 #include <common/base64.h>
 #include <common/cfgparse.h>
-#include <common/initcall.h>
 #include <common/openssl-compat.h>
 
 #include <types/ssl_sock.h>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 56f95581a52e263902b2491e0653172e63a1298d..5fd288068c74de008717b5e980343ae1163e7c1d 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -33,9 +33,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/errors.h>
 #include <common/memory.h>
 #include <common/standard.h>

diff --git a/src/channel.c b/src/channel.c
index 8b0854ef5b42f60944faa11c67b06c90cc6a7666..cd7da30b400336a51ae702e742b56dbae379ff6c 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/buffer.h>
 
 #include <proto/channel.h>

diff --git a/src/checks.c b/src/checks.c
index d42edf478b00151e7d0d7f58df0e5df87716b13b..de182db42e61d165c5315c02180ab3cd3f5be769 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -30,10 +30,9 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/chunk.c b/src/chunk.c
index f2abcba4e6f68b1462b8b8a48cfee847984d0a2d..2ec6a7d796b1ab6fe3db4ee191fd197f5a8b6027 100644 (file)
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/chunk.h>
 #include <common/standard.h>
 

diff --git a/src/cli.c b/src/cli.c
index a083ae7f6ab1733bb4b857b392218d1ecdea7466..381a9e6125cd5be36b7d475c67cdf5345dbdae98 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -26,11 +26,9 @@
 
 #include <net/if.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

diff --git a/src/compression.c b/src/compression.c
index 413a9d81b5e469f78171e9a3c2d52b0b84983390..5797a064675e4e576df7fb4ab374c1df9afbee36 100644 (file)
--- a/src/compression.c
+++ b/src/compression.c
@@ -26,10 +26,9 @@
 #undef free_func
 #endif /* USE_ZLIB */
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 
 #include <types/global.h>

diff --git a/src/connection.c b/src/connection.c
index 6886768070f3fc445bba4fa88e66809b65c489a4..fd6a27498e3474bae0631800173613a25326dc0b 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -12,10 +12,8 @@
 
 #include <errno.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
-#include <common/initcall.h>
 #include <common/namespace.h>
 #include <common/hash.h>
 #include <common/net_helper.h>

diff --git a/src/da.c b/src/da.c
index 0e4d5a7636086a4c98240d50b8b8484b8b9928a3..73e59db390f30fd754b734aa2b8ba1d0ca204b8a 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/errors.h>
 #include <common/http.h>
-#include <common/initcall.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/http_fetch.h>

diff --git a/src/debug.c b/src/debug.c
index efbf19fe58e56b2f984f293e56575874864ae7be..7f281f0294f6e716e2f6e36bce0d5814f96fdde4 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -19,11 +19,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include <haproxy/api.h>
 #include <common/buf.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <common/ist.h>
 #include <common/net_helper.h>
 #include <common/standard.h>

diff --git a/src/dns.c b/src/dns.c
index 38f73c1577646ee0ef12b850b0eea478d72c310e..92c6dda63c6d313bd59caf7671a72d2716a12af8 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -19,9 +19,9 @@
 
 #include <sys/types.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/time.h>
 #include <common/ticks.h>
 #include <common/net_helper.h>

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 9129402c6fc3e9ff28a98f0c64613091e1b2c269..97a0b28c61624d268d2f140f5511b3b66bf9bb9c 100644 (file)
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -14,14 +14,12 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/hathreads.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>
-#include <common/tools.h>
 
 #include <types/global.h>
 

diff --git a/src/ev_evports.c b/src/ev_evports.c
index 3d0dd435b1dffcbd507d34abaf824cbbeb6c14ca..c0005e19858919d3583800da0b0ecc5b36e7224d 100644 (file)
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -18,12 +18,10 @@
 #include <errno.h>
 #include <syslog.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/ticks.h>
 #include <common/time.h>
-#include <common/tools.h>
 
 #include <types/global.h>
 

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 852fa6e838ef64022cbc9013f77b006bccbbcd4b..e9821bdf47e9509de2a5d10780733f4037c5e6d1 100644 (file)
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -17,12 +17,10 @@
 #include <sys/event.h>
 #include <sys/time.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/ticks.h>
 #include <common/time.h>
-#include <common/tools.h>
 
 #include <types/global.h>
 

diff --git a/src/ev_poll.c b/src/ev_poll.c
index 8df244566550ef4a6d42146685d0b6b2c4bf7cc9..0e6dc9445a780bd41f7f90553fe1e76940cb7a9a 100644 (file)
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -17,8 +17,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/ticks.h>
 #include <common/time.h>

diff --git a/src/ev_select.c b/src/ev_select.c
index c4ab023e97a3f8d8bb63cd40bec57c735bda6c56..9dd93b8873c4763bd873e7af85ed6b14b2e8225d 100644 (file)
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -14,8 +14,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/ticks.h>
 #include <common/time.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 8472cf58dc205bf71d7db86fdb9cec40e0a0325e..d0992283ae047ac7752d517aa28bdfcea906bb0a 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -10,11 +10,10 @@
  *
  */
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/chunk.h>
 #include <common/cfgparse.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/standard.h>
 
 #include <types/global.h>

diff --git a/src/fd.c b/src/fd.c
index 1934bd0e7f6ab0a6155f60eedcea8185e887197b..f4aa83b7a193160f2af5bc3e237b6a4e922f17c0 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -87,9 +87,8 @@
 #include <errno.h>
 #endif
 
-#include <common/compat.h>
-#include <common/config.h>
 
+#include <haproxy/api.h>
 #include <types/global.h>
 
 #include <proto/fd.h>

diff --git a/src/filters.c b/src/filters.c
index 07b90431653f5eabbc530ab54ccf46a2cb9696af..9b6bd5b3e698fd8fa6a450142e56d294fdf984a8 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -10,14 +10,12 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
 #include <common/debug.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/errors.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/namespace.h>
 #include <common/standard.h>
 #include <common/hathreads.h>

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index dc7898472b1ae501b68d3564a1697aa4032ac729..abec6b3bff6d7d5b7ddfb1b2ccf37080cae8e322 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -10,10 +10,10 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
 #include <common/cfgparse.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 9db2baa15dcf54ea72f930fac0d7468dbadc63b4..5b8daa144a4fdf0f0ddb55e02517cec9dfd6c580 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -12,12 +12,10 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/time.h>
 

diff --git a/src/flt_trace.c b/src/flt_trace.c
index b06ba150b2031b521c3368e39932169b77252c3a..a3362963607146a9db906a161d674310778115af 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -12,12 +12,11 @@
 
 #include <ctype.h>
 
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/standard.h>
 #include <common/time.h>
-#include <common/tools.h>
 
 #include <types/channel.h>
 #include <types/filters.h>

diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index e6e0168930d5123f2aed4ab606582eafbfd952d9..f4ee5ce8708a696b95bf9c813ab1781d1103afbb 100644 (file)
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -10,10 +10,9 @@
  *
  */
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/time.h>
-#include <common/tools.h>
 #include <proto/freq_ctr.h>
 
 /* Read a frequency counter taking history into account for missing time in

diff --git a/src/frontend.c b/src/frontend.c
index 099d839c338ac04362dd0ae0d53f706b89a2c20a..6274e8a40544fbdbb6afdf62313de12e7b53a821 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -22,11 +22,9 @@
 
 #include <netinet/tcp.h>
 
+#include <haproxy/api.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
-#include <common/initcall.h>
 #include <common/standard.h>
 #include <common/time.h>
 

diff --git a/src/h1.c b/src/h1.c
index 53da12a29a092388ffc35172f589e098a15da58c..f30e4891f03734d87b91d8539741696454ad3c0a 100644 (file)
--- a/src/h1.c
+++ b/src/h1.c
@@ -11,7 +11,7 @@
  */
 
 #include <ctype.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/h1.h>
 #include <common/http-hdr.h>
 

diff --git a/src/h1_htx.c b/src/h1_htx.c
index af18a98b30180be4af253ca868d2363d19265371..e9d79f6f8a2dab2da910f0d0fa4ee94c2b6ffa8e 100644 (file)
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/cfgparse.h>
 #include <common/h1.h>

diff --git a/src/h2.c b/src/h2.c
index 53cb0d34a21cd3d11258bb5c9192113e2d2b4126..891c3e06cd0657e852cd595a2859393595b1bc47 100644 (file)
--- a/src/h2.c
+++ b/src/h2.c
@@ -26,7 +26,7 @@
  */
 
 #include <inttypes.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/h2.h>
 #include <common/http-hdr.h>
 #include <common/ist.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 5d7b0fe9bbe633266e317a6c7106d4da40233844..0e71ba72eb5c68a4882362166f366f1114fbb991 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -78,16 +78,13 @@
 #include <systemd/sd-daemon.h>
 #endif
 
+#include <haproxy/api.h>
 #include <import/sha1.h>
 
 #include <common/base64.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
-#include <common/defaults.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/namespace.h>

diff --git a/src/hlua.c b/src/hlua.c
index 83cc3cd2e490074f2e546d4b237dfc52b03d5f0b..15c34cd325140fd15201048ad70a635c498d790b 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -11,7 +11,6 @@
  */
 
 #include <ctype.h>
-#include <limits.h>
 #include <setjmp.h>
 
 #include <lauxlib.h>
@@ -22,12 +21,11 @@
 #error "Requires Lua 5.3 or later."
 #endif
 
+#include <haproxy/api.h>
 #include <import/ebpttree.h>
 
 #include <common/cfgparse.h>
-#include <common/compiler.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <common/xref.h>
 #include <common/h1.h>
 

diff --git a/src/hpack-huff.c b/src/hpack-huff.c
index bdcff7fe709b6e03e63fd0aa161c3bc0d8bc331d..19ea16348b3bc0a11f4ba201d9ed48bc4d3b13c2 100644 (file)
--- a/src/hpack-huff.c
+++ b/src/hpack-huff.c
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hpack-huff.h>
 
 struct huff {

diff --git a/src/http.c b/src/http.c
index aaa6ddbe441f1452e73e501eab1cbde29dd6f111..0bd8f87ffb21ed2fbe5a942a64b2190304eb3a91 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -11,7 +11,7 @@
  */
 
 #include <ctype.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/http.h>
 #include <common/standard.h>
 

diff --git a/src/http_acl.c b/src/http_acl.c
index edd3be579f684d5a52436232c070acfedd8674a2..5a8c634b2e03140df9df35c40134d577bc866124 100644 (file)
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -16,12 +16,10 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/api.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/http.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/standard.h>
 #include <common/version.h>

diff --git a/src/http_act.c b/src/http_act.c
index b18da6164ef0eb59ffb3cee46a39415ed38ab5b7..d116f1d17c4468a2c748269e8cd42daa51af2626 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -16,13 +16,11 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/http.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/standard.h>
 #include <common/uri_auth.h>

diff --git a/src/http_ana.c b/src/http_ana.c
index cf9570c3b7dc8557adc4edffa730ce86ff18e0f6..bd2db1fe743dd0c3d1ed1a3286dac7170cf1d13f 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -10,8 +10,8 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/base64.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/htx.h>
 #include <common/net_helper.h>

diff --git a/src/http_conv.c b/src/http_conv.c
index fdf3c42f1188a26288b305210803c04e154f64df..d83541d342c70ee0c1dc22f267d5e1c24dfff398 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -16,12 +16,10 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/api.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/http.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/standard.h>
 #include <common/version.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 5fc68a9f227d2dec7eed9a7e9ba4c4b91f1da61c..96c774be6a613bf5018ea01684f0117e48a72086 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -16,15 +16,13 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/api.h>
 #include <common/base64.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/h1.h>
 #include <common/http.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/standard.h>
 #include <common/version.h>

diff --git a/src/http_htx.c b/src/http_htx.c
index 7211a4de149683e3581bac86a9899f390b49377c..f4a60042494bfaacd31aa74088b62bb7cf3496c2 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -14,9 +14,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <haproxy/api.h>
 #include <types/global.h>
 
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/cfgparse.h>
 #include <common/h1.h>

diff --git a/src/http_rules.c b/src/http_rules.c
index 2e58ec2e0b67cbf0d96ee1c4177d452ed6c66989..a2a4e05b4ff829ff807e72bb11761b337a147d90 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -16,10 +16,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/http.h>
 #include <common/memory.h>

diff --git a/src/lb_chash.c b/src/lb_chash.c
index 91724fdaf23141352f550d4ee1da41cfea00f0fb..b216541239dad7b56fd55822ae9ce6611b68dff6 100644 (file)
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -16,8 +16,7 @@
  *
  */
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/standard.h>
 #include <import/eb32tree.h>

diff --git a/src/lb_fas.c b/src/lb_fas.c
index 1042e4b83a664ac8c941fa2035f536a8b335c1a5..ef507b7cb38f0b04976ace372654e69bd983e4ef 100644 (file)
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -16,8 +16,7 @@
  *
  */
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <import/eb32tree.h>
 

diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index 409e5f821054b7b4a73443c731682e844b4e4720..89634bfe4fc6a117a18c81730d159e3604f3c6b1 100644 (file)
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -10,8 +10,7 @@
  *
  */
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <import/eb32tree.h>
 

diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index fe3d86be1667689a21b7732ba2a59c38d65bed59..31e8bb2d10e39671e45f17dcfc00170a67c1e8d1 100644 (file)
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -10,8 +10,7 @@
  *
  */
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <import/eb32tree.h>
 

diff --git a/src/lb_map.c b/src/lb_map.c
index a5d1ec39c9a40f5089854dc71343e18e4f78b81e..660475b961d719d3323005dc1d6516c6f6a6ae11 100644 (file)
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -10,8 +10,7 @@
  *
  */
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <import/eb32tree.h>
 

diff --git a/src/listener.c b/src/listener.c
index 01feee58f2544893a6e7ff8a29dd892ed4cd311e..ab9f84b567dfba290f0fdb4da7030108499e6ecf 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -18,10 +18,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/log.c b/src/log.c
index b4b00cfa14bd7b6c60097f4a355b66c112c0f0ae..87b12fc38661035fd468bae67ad7bc00421f1a80 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -24,9 +24,7 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 
-#include <common/config.h>
-#include <common/compat.h>
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <common/version.h>

diff --git a/src/map.c b/src/map.c
index 39a72c95294c3aa4dd4d1eee2f6f14b1b0fabc0c..5f98dd0a00541cfbc0981f84a513ecb7bf559a0c 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -10,10 +10,9 @@
  *
  */
 
-#include <limits.h>
 #include <stdio.h>
 
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 
 #include <types/applet.h>

diff --git a/src/memory.c b/src/memory.c
index b442f0a108594b255804d57239770b1af3833c55..437ce10da0672b258c4a140e951c9d04a8fcfb3f 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -11,16 +11,15 @@
  */
 #include <errno.h>
 
+#include <haproxy/api.h>
 #include <types/applet.h>
 #include <types/cli.h>
 #include <types/global.h>
 #include <types/stats.h>
 
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index d1db2a011a1ca92ee46bec02681b0132b59eaea6..5ce6f6191ed10cd05bbf46a41202aa4fe74e180b 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -10,12 +10,11 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/fcgi.h>
 #include <common/h1.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/ist.h>
 #include <common/mini-clist.h>
 #include <common/net_helper.h>

diff --git a/src/mux_h1.c b/src/mux_h1.c
index ac383f5bc4cde72c14c59209f79d09129f67b93e..1c75e93cd12fcd09515de3432c85929f64c1ae4c 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -9,12 +9,11 @@
  * 2 of the License, or (at your option) any later version.
  *
  */
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/h1.h>
 #include <common/h2.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 
 #include <import/ebistree.h>
 

diff --git a/src/mux_h2.c b/src/mux_h2.c
index a77cf840da81afcad71bdd0d641152d566873172..3c0ef5f8e26dfb5be734a2b4f5b59ee3a9588b1a 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -10,15 +10,14 @@
  *
  */
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/h1.h>
 #include <common/h2.h>
 #include <common/hpack-dec.h>
 #include <common/hpack-enc.h>
 #include <common/hpack-tbl.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/net_helper.h>
 #include <proto/connection.h>
 #include <proto/http_htx.h>

diff --git a/src/mux_pt.c b/src/mux_pt.c
index 6b154e33bcd03c80dd14f5ff6886d2e59f23c2b3..1543f46d89807e1892258afb1fb0a803821990e8 100644 (file)
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -10,8 +10,7 @@
  *
  */
 
-#include <common/config.h>
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <proto/connection.h>
 #include <proto/stream.h>
 #include <proto/task.h>

diff --git a/src/mworker-prog.c b/src/mworker-prog.c
index 1d401a3c6d7acd3b015402686baebaf833e0c0ac..f445c7fa69c64d2248005e901d930ca27221a91c 100644 (file)
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 
 #include <proto/log.h>
 #include <proto/mworker.h>

diff --git a/src/mworker.c b/src/mworker.c
index 9c46fffe53ed7e734d4fe5fe50fb2bcff6d31b80..f41ee9fa3553265020b4adb2e474b937f8971dea 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <sys/wait.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/version.h>
 

diff --git a/src/namespace.c b/src/namespace.c
index 89a968e361bced0df93d72255695cbd9090cb929..a6d208082d2c255378075c284ec715aa8235cc27 100644 (file)
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -10,8 +10,8 @@
 
 #include <string.h>
 
+#include <haproxy/api.h>
 #include <common/namespace.h>
-#include <common/compiler.h>
 #include <common/hash.h>
 #include <common/errors.h>
 #include <proto/log.h>

diff --git a/src/pattern.c b/src/pattern.c
index a90820f21f53a946fcdcc676fc1b6b7a7a93e367..25c3d1050199bb285003621825425d2643a1523e 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/net_helper.h>
 #include <common/standard.h>
 

diff --git a/src/payload.c b/src/payload.c
index 05201ffbb3ce84548300717fd7ab008118d9a989..3b8eaeb5e9d4b4439110b88c311a2c6f8bd4840e 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <common/net_helper.h>
 #include <common/htx.h>
 #include <proto/acl.h>

diff --git a/src/peers.c b/src/peers.c
index 9782ff3c1e95587215cbf7a9920c1a635fabc95f..e53076081706d7fb3d1948adde6b36b58e3fe462 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -20,8 +20,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/net_helper.h>
 #include <common/time.h>
 #include <common/standard.h>

diff --git a/src/pipe.c b/src/pipe.c
index bc45de3a3360d32ce5413e49d5951819e68259e7..b08882087eff06a467a97edeecabbd97e06cc93a 100644 (file)
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <common/memory.h>
 

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index fdbc81d1fe239f5eef5b613ba664843580db55bc..a8b78caa48b4c8bcf0b84e42049441c1a864c7fc 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -26,11 +26,9 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index afcb1bc0af2a02dfd679e193ea2f578f28a9dd31..f1e65c5f6c019fdf63d5a07a0e12725cda7ffdbc 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -30,11 +30,9 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/namespace.h>

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 256a58e5637680bb60b02b91e81688aa0d5c0eca..d41e1c0a4146c5ba429380c139a563475de2b1bc 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -26,11 +26,9 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-#include <common/compat.h>
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/protocol.c b/src/protocol.c
index ac45cf2e2180b9169f88ef4d48ccf7f7aacc6c65..6c4341e34c4df791efcf27e41e7b6efc229ba768 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/errors.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

diff --git a/src/proxy.c b/src/proxy.c
index 0845bced14247464997460a8aaca820b33ad52bd..a62df4d0fd09bd572a4bbe9ea3fdcadd226ebb60 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -17,12 +17,9 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <common/defaults.h>
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/time.h>
 

diff --git a/src/queue.c b/src/queue.c
index 890574d7c6c650ad8c2b53918e4c70c92dbff51f..3c5007687907605e71af70a2a0442947c4ac23e3 100644 (file)
--- a/src/queue.c
+++ b/src/queue.c
@@ -69,8 +69,7 @@
  *   - a pendconn doesn't switch between queues, it stays where it is.
  */
 
-#include <common/config.h>
-#include <common/initcall.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/time.h>
 #include <common/hathreads.h>

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 340f92993a1b2258ca3bfaa57fe0834702b93e16..af8cc65afb5b185d3d8e8de1820122cb4bbd2a29 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -22,9 +22,8 @@
 
 #include <netinet/tcp.h>
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/standard.h>
 #include <common/ticks.h>

diff --git a/src/regex.c b/src/regex.c
index 195f9a79d99249ab0c5e0bd5b1122e788db5d50b..fa1c91b45c729d1913b21ae02c4724e72061036d 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -14,9 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <haproxy/api.h>
 #include <types/global.h>
-#include <common/config.h>
-#include <common/defaults.h>
 #include <common/regex.h>
 #include <common/standard.h>
 #include <proto/log.h>

diff --git a/src/ring.c b/src/ring.c
index 2a6bb02d18ff17c5660e5894422f721f74da3648..b011f5363beadd9d99c718d25286d709aa746e14 100644 (file)
--- a/src/ring.c
+++ b/src/ring.c
@@ -19,9 +19,8 @@
  */
 
 #include <stdlib.h>
+#include <haproxy/api.h>
 #include <common/buf.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/hathreads.h>
 #include <types/applet.h>
 #include <proto/cli.h>

diff --git a/src/sample.c b/src/sample.c
index f10f4395b82fe5d401baa514fc1a444580140bbf..e4841fd9ce24dc0833c8a9df3fdfe8ef02099b7e 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -16,12 +16,12 @@
 #include <arpa/inet.h>
 #include <stdio.h>
 
+#include <haproxy/api.h>
 #include <types/global.h>
 
 #include <common/chunk.h>
 #include <common/hash.h>
 #include <common/http.h>
-#include <common/initcall.h>
 #include <common/net_helper.h>
 #include <common/standard.h>
 #include <common/uri_auth.h>

diff --git a/src/server.c b/src/server.c
index 15e2f8fec31f73b53c51ca494b35c5bd31f23e83..9d6e7a6a09a95077ebe4c740fa2b288ac1b29012 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -14,12 +14,11 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <haproxy/api.h>
 #include <import/xxhash.h>
 
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/namespace.h>
 #include <common/time.h>
 

diff --git a/src/session.c b/src/session.c
index 74b029e798ea76aeff5bd20912187b48a1c24c22..fd842a4041971d21760b86d3295d642a9a27b673 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/buffer.h>
 #include <common/debug.h>
 #include <common/http.h>

diff --git a/src/sink.c b/src/sink.c
index ff498b24d87850710e2bbac77552417d8962a1b9..20d3d79b16fd3e09b610798d504ee8dd664fc777 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -18,9 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/ist.h>
 #include <common/mini-clist.h>
 #include <common/time.h>

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index f3fd0b4b02958ff96b15cbb0fe32e825b29ea470..85703d54828caa07264b351e9f43b812c57f3ed1 100644 (file)
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -20,8 +20,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/initcall.h>
 #include <common/openssl-compat.h>
 #include <common/standard.h>
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 58ff5833a920b409695d94a738666a105852f89f..79e81d7ba8c0c575e58603e59ca047a09b14197d 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -40,16 +40,14 @@
 #include <netdb.h>
 #include <netinet/tcp.h>
 
+#include <haproxy/api.h>
 #include <import/lru.h>
 #include <import/xxhash.h>
 
 #include <common/buffer.h>
 #include <common/chunk.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <common/openssl-compat.h>
 #include <common/standard.h>
 #include <common/ticks.h>

diff --git a/src/standard.c b/src/standard.c
index 33067bb73a51be7292aea20ad6bd521446f4e62e..fe174af3a977f79a3a9f6ba5e16d46aa875e4257 100644 (file)
--- a/src/standard.c
+++ b/src/standard.c
@@ -36,10 +36,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/api.h>
 #include <common/chunk.h>
-#include <common/config.h>
 #include <common/standard.h>
-#include <common/tools.h>
 #include <types/global.h>
 #include <proto/applet.h>
 #include <proto/dns.h>

diff --git a/src/stats.c b/src/stats.c
index 1413d3dcbcfadf70116c5af66530bdfb929e83ad..bfe7accb4491e11f51c3190ada5d2de11ec1610a 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -24,13 +24,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/http.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 862aafc7ed34023098e52dfe5bf8648ede04b3ba..37131f6a98ebea1a701fcef78a5093ccae2bbca9 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -14,9 +14,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/net_helper.h>

diff --git a/src/stream.c b/src/stream.c
index 1b8a868704c1a46e0e1440bcca044052b46e98b4..9030603810f940be53c60ddc3fb6dcbb0f04fa54 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -14,13 +14,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/config.h>
 #include <common/buffer.h>
 #include <common/debug.h>
 #include <common/hathreads.h>
 #include <common/htx.h>
-#include <common/initcall.h>
 #include <common/memory.h>
 
 #include <types/applet.h>

diff --git a/src/stream_interface.c b/src/stream_interface.c
index ca0519741d629da3de927e61deec82cabfcb5310..fc75c39fc55c70e92c055212a93983f22f2066a3 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -19,9 +19,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
 #include <common/standard.h>
 #include <common/ticks.h>

diff --git a/src/task.c b/src/task.c
index 2d965f291ab85ab1517d00b8e93f7b6d8f5c0748..a116b2e80f7f0ec4d9489ba479363d4699204064 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index fc8b4aed9245d42c184214a18da0ef51e6d3b211..58e67ca765759ab150f9fa2f11b2b16301c1e230 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -9,11 +9,9 @@
  * 2 of the License, or (at your option) any later version.
  *
  */
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/compat.h>
-#include <common/config.h>
 #include <common/debug.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/ticks.h>

diff --git a/src/time.c b/src/time.c
index 8e3afda0ea37dd0b0428b9af4cb44257472ab28a..5c8ed4be2564647516784a172f7f2468ffbe9722 100644 (file)
--- a/src/time.c
+++ b/src/time.c
@@ -10,11 +10,10 @@
  *
  */
 
-#include <inttypes.h>
 #include <unistd.h>
 #include <sys/time.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <common/hathreads.h>

diff --git a/src/trace.c b/src/trace.c
index d3c27d8f43e83eeef1604c983272b19301b8e2b8..667cd81cac6f1797c7cc96a22e4ba500e6174a62 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -18,9 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#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 <proto/cli.h>

diff --git a/src/uri_auth.c b/src/uri_auth.c
index 352737a31fcccbcffb9719f7750a39d91fa6e0b9..06266f338b4e08a6ecf1c10bad8fa2441849c6b5 100644 (file)
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <haproxy/api.h>
 #include <common/base64.h>
-#include <common/config.h>
 #include <common/uri_auth.h>
 
 #include <types/stats.h>

diff --git a/src/vars.c b/src/vars.c
index ec95aaa3deaa8c62948259acbb72432c6e418d72..a213657b8d8d394da1c2ca75834d48ea5bf4c6ce 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -1,8 +1,8 @@
 #include <ctype.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/http.h>
-#include <common/initcall.h>
 #include <common/mini-clist.h>
 
 #include <types/vars.h>

diff --git a/src/wdt.c b/src/wdt.c
index f8bd65723b5ddf2f5c5bbb8b55d1c9651bc6e69e..53382ef87e92ed530209f5516167ce6dcb7469df 100644 (file)
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -12,10 +12,9 @@
 #include <signal.h>
 #include <time.h>
 
-#include <common/config.h>
+#include <haproxy/api.h>
 #include <common/debug.h>
 #include <common/hathreads.h>
-#include <common/initcall.h>
 #include <common/standard.h>
 #include <types/global.h>
 #include <types/signal.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index d53e378dc6331684b095a6d08a9c0f255bc06ca9..f5de52af55d14d2c57db1484520cc7df79e4047a 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
 #include <common/buffer.h>
 #include <common/errors.h>
-#include <common/initcall.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/log.h>