diff --git a/src/action.c b/src/action.c
index 17716b5..63c1188 100644
--- a/src/action.c
+++ b/src/action.c
@@ -10,12 +10,12 @@
  *
  */
 
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
 
-#include <proto/action.h>
 #include <proto/log.h>
 #include <proto/obj_type.h>
 #include <proto/proxy.h>
diff --git a/src/cache.c b/src/cache.c
index 0fa1c64..ad34a9d 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -10,13 +10,13 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/shctx.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
-#include <types/action.h>
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/proxy.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 2f9ed1b..0505611 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -33,6 +33,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
@@ -54,7 +55,6 @@
 #include <types/stats.h>
 
 #include <proto/acl.h>
-#include <proto/action.h>
 #include <proto/auth.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
diff --git a/src/checks.c b/src/checks.c
index b5c76fb..279e8af 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -30,6 +30,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
@@ -48,7 +49,6 @@
 #include <types/dns.h>
 #include <types/stats.h>
 
-#include <proto/action.h>
 #include <proto/arg.h>
 #include <proto/backend.h>
 #include <proto/checks.h>
diff --git a/src/dns.c b/src/dns.c
index 79a7a0d..d251674 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -19,6 +19,7 @@
 
 #include <sys/types.h>
 
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
@@ -26,14 +27,12 @@
 #include <haproxy/ticks.h>
 #include <haproxy/net_helper.h>
 
-#include <types/action.h>
 #include <types/applet.h>
 #include <types/cli.h>
 #include <types/global.h>
 #include <types/dns.h>
 #include <types/stats.h>
 
-#include <proto/action.h>
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <proto/checks.h>
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 52771ef..4bb259e 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -12,6 +12,7 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/thread.h>
@@ -23,7 +24,6 @@
 #include <types/spoe.h>
 
 #include <proto/acl.h>
-#include <proto/action.h>
 #include <proto/arg.h>
 #include <proto/backend.h>
 #include <proto/filters.h>
diff --git a/src/http_act.c b/src/http_act.c
index cba3c79..8bb9877 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
@@ -32,7 +33,6 @@
 
 #include <proto/acl.h>
 #include <proto/arg.h>
-#include <proto/action.h>
 #include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index d26b9a4..3ad3bcc 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <haproxy/http.h>
@@ -22,7 +23,6 @@
 #include <types/capture.h>
 
 #include <proto/acl.h>
-#include <proto/action.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
 #include <proto/connection.h>
diff --git a/src/http_rules.c b/src/http_rules.c
index 77ac2cb..ba19e87 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
@@ -28,7 +29,6 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/action.h>
 #include <proto/arg.h>
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 9b109f4..c21d1c9 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -30,13 +30,13 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
 #include <haproxy/namespace.h>
 
-#include <types/action.h>
 #include <types/connection.h>
 #include <types/global.h>
 #include <types/stream.h>
diff --git a/src/stream.c b/src/stream.c
index e2e7880..530be55 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/dict.h>
@@ -32,7 +33,6 @@
 #include <types/stats.h>
 
 #include <proto/acl.h>
-#include <proto/action.h>
 #include <haproxy/activity.h>
 #include <proto/arg.h>
 #include <proto/backend.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 012bfd3..d6c1eb3 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  *
  */
+#include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
@@ -22,7 +23,6 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/action.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/log.h>