diff --git a/src/cache.c b/src/cache.c
index 36c54a8..17d015a 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -14,6 +14,7 @@
 #include <haproxy/api.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/filters.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
@@ -22,11 +23,9 @@
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
-#include <types/filters.h>
 #include <types/proxy.h>
 
 #include <proto/proxy.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 
diff --git a/src/cfgparse.c b/src/cfgparse.c
index e5cac8b..8bd60b7 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -45,6 +45,7 @@
 #include <haproxy/connection.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
@@ -67,11 +68,9 @@
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 
-#include <types/filters.h>
 #include <haproxy/global.h>
 
 #include <proto/backend.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index dda4b3a..9097dab 100644
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -15,6 +15,7 @@
 #include <haproxy/chunk.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/regex.h>
@@ -25,7 +26,6 @@
 #include <haproxy/global.h>
 
 #include <proto/fcgi-app.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
diff --git a/src/filters.c b/src/filters.c
index 130f5d7..b658739 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -14,6 +14,7 @@
 #include <haproxy/buf-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/flt_http_comp.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
@@ -22,10 +23,7 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
-#include <types/filters.h>
-
 #include <haproxy/compression.h>
-#include <proto/filters.h>
 #include <haproxy/http_ana.h>
 #include <proto/stream.h>
 
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 0fb213d..1b8fffb 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -13,6 +13,7 @@
 #include <haproxy/api.h>
 #include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/filters.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
@@ -22,10 +23,8 @@
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
-#include <types/filters.h>
 #include <types/proxy.h>
 
-#include <proto/filters.h>
 #include <proto/stream.h>
 
 const char *http_comp_flt_id = "compression filter";
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 9e9eaeb..f532d2d 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -16,6 +16,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/sample.h>
@@ -35,7 +36,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/backend.h>
-#include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 125401a..2f55b73 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -14,18 +14,17 @@
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
+#include <haproxy/filters.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
-#include <types/filters.h>
 #include <haproxy/global.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 
diff --git a/src/haproxy.c b/src/haproxy.c
index 6370d8e..6488df9 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -91,6 +91,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/hlua.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
@@ -116,14 +117,12 @@
 #include <haproxy/vars.h>
 
 #include <haproxy/capture-t.h>
-#include <types/filters.h>
 #include <haproxy/global.h>
 
 #include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index 6e15d67..8e8dd2f 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -17,6 +17,7 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
+#include <haproxy/filters.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
@@ -30,7 +31,6 @@
 
 #include <haproxy/capture-t.h>
 
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
diff --git a/src/proxy.c b/src/proxy.c
index 803f186..78d91e6 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -22,6 +22,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/listener.h>
@@ -40,7 +41,6 @@
 
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
diff --git a/src/stream.c b/src/stream.c
index 010509f..fc2798d 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -27,6 +27,7 @@
 #include <haproxy/dict.h>
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
@@ -43,13 +44,10 @@
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
-#include <types/filters.h>
-
 #include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <proto/stream.h>