diff --git a/src/backend.c b/src/backend.c
index a002bbe..6d85967 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -21,6 +21,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/hash.h>
+#include <haproxy/http.h>
 #include <common/htx.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
diff --git a/src/checks.c b/src/checks.c
index 2374f65..b0d6776 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -39,7 +39,7 @@
 #include <common/standard.h>
 #include <haproxy/time.h>
 #include <haproxy/thread.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <common/h1.h>
 #include <common/htx.h>
 
diff --git a/src/da.c b/src/da.c
index c783fb1..51f6e38 100644
--- a/src/da.c
+++ b/src/da.c
@@ -3,7 +3,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/http_fetch.h>
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 4b0e546..5f0853a 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -12,6 +12,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/http.h>
 #include <common/cfgparse.h>
 #include <common/htx.h>
 #include <haproxy/list.h>
diff --git a/src/h1_htx.c b/src/h1_htx.c
index 6e582e3..83ebfb1 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -13,7 +13,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/h1.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <common/htx.h>
 
 #include <proto/h1_htx.h>
diff --git a/src/h2.c b/src/h2.c
index c94ea8e..fa72e1c 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -27,6 +27,7 @@
 
 #include <inttypes.h>
 #include <haproxy/api.h>
+#include <haproxy/http.h>
 #include <common/h2.h>
 #include <common/http-hdr.h>
 #include <import/ist.h>
diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index 53a2b40..b759f11 100644
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -18,6 +18,7 @@
 #include <lua.h>
 #include <lualib.h>
 
+#include <haproxy/http.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <haproxy/time.h>
diff --git a/src/http.c b/src/http.c
index 0bd8f87..ae315a8 100644
--- a/src/http.c
+++ b/src/http.c
@@ -12,7 +12,7 @@
 
 #include <ctype.h>
 #include <haproxy/api.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <common/standard.h>
 
 /* It is about twice as fast on recent architectures to lookup a byte in a
diff --git a/src/http_acl.c b/src/http_acl.c
index 368a4b1..780962a 100644
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -18,7 +18,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>
 #include <haproxy/version.h>
diff --git a/src/http_act.c b/src/http_act.c
index 4193b91..a5ce9d7 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -19,7 +19,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <common/standard.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index 9f65082..d89bcf5 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -12,6 +12,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
+#include <haproxy/http.h>
 #include <common/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
diff --git a/src/http_conv.c b/src/http_conv.c
index 8937fa0..72cb4af 100644
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -18,7 +18,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>
 #include <haproxy/version.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 8fe22b8..2d99642 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -20,7 +20,7 @@
 #include <haproxy/base64.h>
 #include <haproxy/chunk.h>
 #include <common/h1.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <common/htx.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>
diff --git a/src/http_htx.c b/src/http_htx.c
index af8758c..ede8a0e 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -20,7 +20,7 @@
 
 #include <common/cfgparse.h>
 #include <common/h1.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <common/htx.h>
 
 #include <proto/arg.h>
diff --git a/src/http_rules.c b/src/http_rules.c
index 96508e9..94aff63 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -19,7 +19,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>
 #include <haproxy/version.h>
diff --git a/src/log.c b/src/log.c
index d4f4922..5778994 100644
--- a/src/log.c
+++ b/src/log.c
@@ -25,6 +25,7 @@
 #include <sys/uio.h>
 
 #include <haproxy/api.h>
+#include <haproxy/http.h>
 #include <common/standard.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
diff --git a/src/sample.c b/src/sample.c
index 14615a1..380dd6f 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -21,7 +21,7 @@
 
 #include <haproxy/chunk.h>
 #include <haproxy/hash.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <common/standard.h>
diff --git a/src/session.c b/src/session.c
index d31806a..619ff06 100644
--- a/src/session.c
+++ b/src/session.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/pool.h>
 
 #include <types/global.h>
diff --git a/src/stats.c b/src/stats.c
index b5f5e9c..4820d3b 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -27,7 +27,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/debug.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <common/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
diff --git a/src/vars.c b/src/vars.c
index 227c94b..edcf1af 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -2,7 +2,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/http.h>
+#include <haproxy/http.h>
 #include <haproxy/list.h>
 
 #include <types/vars.h>