diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 0fdf5db..d72d83a 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -14,7 +14,7 @@
 #include <common/cfgparse.h>
 #include <common/uri_auth.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/compression-t.h>
 #include <haproxy/http_htx.h>
 #include <types/stats.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 011977a..bf2373b 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -36,6 +36,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/auth.h>
 #include <haproxy/api.h>
+#include <haproxy/capture.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
@@ -48,7 +49,6 @@
 #include <haproxy/namespace.h>
 #include <haproxy/thread.h>
 
-#include <types/capture.h>
 #include <types/filters.h>
 #include <types/global.h>
 #include <types/obj_type.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 95c35de..37e1176 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -101,7 +101,7 @@
 #include <haproxy/version.h>
 #include <haproxy/thread.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/global.h>
diff --git a/src/http_act.c b/src/http_act.c
index 9355fa0..51bb1a3 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -28,7 +28,7 @@
 #include <common/uri_auth.h>
 #include <haproxy/version.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/global.h>
 
 #include <proto/acl.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index 3ad3bcc..da16098 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -20,7 +20,7 @@
 #include <haproxy/regex.h>
 #include <common/uri_auth.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 
 #include <proto/acl.h>
 #include <proto/channel.h>
diff --git a/src/http_conv.c b/src/http_conv.c
index e3e9517..da7d53f 100644
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -23,7 +23,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/global.h>
 
 #include <haproxy/arg.h>
diff --git a/src/http_rules.c b/src/http_rules.c
index c6bc540..758e619 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -25,7 +25,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/global.h>
 
 #include <proto/acl.h>
diff --git a/src/proxy.c b/src/proxy.c
index 45750b7..3f889c2 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,7 +26,7 @@
 #include <import/eb32tree.h>
 #include <import/ebistree.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/cli.h>
 #include <types/global.h>
 #include <types/obj_type.h>
diff --git a/src/stream.c b/src/stream.c
index b2c71d6..4bd8d51 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/capture.h>
 #include <common/cfgparse.h>
 #include <haproxy/dict.h>
 #include <haproxy/dns.h>
@@ -27,7 +28,6 @@
 #include <haproxy/pool.h>
 
 #include <types/applet.h>
-#include <types/capture.h>
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/global.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 262224d..6cd87ef 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -11,6 +11,7 @@
  */
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/capture-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
@@ -18,7 +19,6 @@
 #include <haproxy/time.h>
 
 #include <haproxy/arg-t.h>
-#include <types/capture.h>
 #include <types/connection.h>
 #include <types/global.h>