diff --git a/src/backend.c b/src/backend.c
index 6d85967..e5ceda9 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -22,7 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
diff --git a/src/cache.c b/src/cache.c
index 51e0d86..754cb44 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -35,7 +35,7 @@
 
 #include <common/cfgparse.h>
 #include <haproxy/hash.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 
 #define CACHE_FLT_F_IMPLICIT_DECL  0x00000001 /* The cache filtre was implicitly declared (ie without
diff --git a/src/checks.c b/src/checks.c
index 6f409e3..2b7aa8c 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -41,7 +41,7 @@
 #include <haproxy/thread.h>
 #include <haproxy/http.h>
 #include <haproxy/h1.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 
 #include <types/global.h>
 #include <types/dns.h>
diff --git a/src/filters.c b/src/filters.c
index 50d1c8a..5cfac40 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -14,7 +14,7 @@
 #include <haproxy/buf-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/namespace.h>
 #include <common/standard.h>
 
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 5f0853a..ac4a3bf 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -14,7 +14,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/http.h>
 #include <common/cfgparse.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
 
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 69862ae..94aef8c 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -13,7 +13,7 @@
 #include <ctype.h>
 
 #include <haproxy/api.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <common/standard.h>
 #include <haproxy/time.h>
 
diff --git a/src/h1_htx.c b/src/h1_htx.c
index 69472a6..1f0dddb 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -14,7 +14,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 
 #include <proto/h1_htx.h>
 
diff --git a/src/h2.c b/src/h2.c
index c59c3f2..14eeabc2 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -30,6 +30,7 @@
 #include <haproxy/http.h>
 #include <common/h2.h>
 #include <haproxy/http-hdr-t.h>
+#include <haproxy/htx.h>
 #include <import/ist.h>
 #include <types/global.h>
 
diff --git a/src/http_ana.c b/src/http_ana.c
index d89bcf5..3065e38 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -13,7 +13,7 @@
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <haproxy/http.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <common/uri_auth.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 3f30797..221ac94 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -21,7 +21,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>
 #include <haproxy/version.h>
diff --git a/src/http_htx.c b/src/http_htx.c
index d410f03..f345b4b 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -21,7 +21,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 
 #include <proto/arg.h>
 #include <proto/http_htx.h>
diff --git a/src/htx.c b/src/htx.c
index d1679a2..4d9ef68 100644
--- a/src/htx.c
+++ b/src/htx.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/chunk.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 
 struct htx htx_empty = { .size = 0, .data = 0, .head  = -1, .tail = -1, .first = -1 };
 
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index f58609e..aa6c018 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -14,7 +14,7 @@
 #include <common/cfgparse.h>
 #include <common/fcgi.h>
 #include <haproxy/h1.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
 #include <haproxy/net_helper.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 09bf871..4afaa29 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -14,7 +14,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
 #include <common/h2.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 
 #include <import/ebistree.h>
 
diff --git a/src/mux_h2.c b/src/mux_h2.c
index d672f99..8c72f81 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -18,7 +18,7 @@
 #include <common/hpack-dec.h>
 #include <common/hpack-enc.h>
 #include <common/hpack-tbl.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/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 1543f46..43b0da4 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -11,6 +11,7 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/buf.h>
 #include <proto/connection.h>
 #include <proto/stream.h>
 #include <proto/task.h>
diff --git a/src/payload.c b/src/payload.c
index ca9c9d7..7d7cb36 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -15,7 +15,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/net_helper.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <proto/acl.h>
 #include <proto/arg.h>
 #include <proto/channel.h>
diff --git a/src/sample.c b/src/sample.c
index 380dd6f..e1e4d9c 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -19,6 +19,7 @@
 #include <haproxy/api.h>
 #include <types/global.h>
 
+#include <haproxy/buf.h>
 #include <haproxy/chunk.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
diff --git a/src/stats.c b/src/stats.c
index 4820d3b..d7d581d 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -28,7 +28,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/debug.h>
 #include <haproxy/http.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
diff --git a/src/stream.c b/src/stream.c
index 4af4986..27030ea 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -19,7 +19,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
-#include <common/htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/pool.h>
 
 #include <types/applet.h>