diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 7c58bab6c..c64385cdf 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/http.h>
@@ -23,7 +24,6 @@
 
 #include <types/global.h>
 
-#include <proto/action.h>
 #include <proto/applet.h>
 #include <proto/backend.h>
 #include <haproxy/compression.h>
diff --git a/include/types/action.h b/include/haproxy/action-t.h
similarity index 97%
rename from include/types/action.h
rename to include/haproxy/action-t.h
index c70fcf733..54dd63b9e 100644
--- a/include/types/action.h
+++ b/include/haproxy/action-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/action.h
+ * include/haproxy/action-t.h
  * This file contains actions definitions.
  *
  * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_ACTION_H
-#define _TYPES_ACTION_H
+#ifndef _HAPROXY_ACTION_T_H
+#define _HAPROXY_ACTION_T_H
 
 #include <haproxy/regex-t.h>
 
@@ -173,4 +173,4 @@ struct action_kw_list {
 	struct action_kw kw[VAR_ARRAY];
 };
 
-#endif /* _TYPES_ACTION_H */
+#endif /* _HAPROXY_ACTION_T_H */
diff --git a/include/proto/action.h b/include/haproxy/action.h
similarity index 93%
rename from include/proto/action.h
rename to include/haproxy/action.h
index eb660dd5d..c7ce92dc5 100644
--- a/include/proto/action.h
+++ b/include/haproxy/action.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/action.h
+ * include/haproxy/action.h
  * This file contains actions prototypes.
  *
  * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_ACTION_H
-#define _PROTO_ACTION_H
+#ifndef _HAPROXY_ACTION_H
+#define _HAPROXY_ACTION_H
 
-#include <types/action.h>
+#include <stdio.h>
+#include <haproxy/action-t.h>
+#include <haproxy/list.h>
 
 int act_resolution_cb(struct dns_requester *requester, struct dns_nameserver *nameserver);
 int act_resolution_error_cb(struct dns_requester *requester, int error_code);
@@ -88,4 +90,4 @@ int check_trk_action(struct act_rule *rule, struct proxy *px, char **err);
  */
 int check_capture(struct act_rule *rule, struct proxy *px, char **err);
 
-#endif /* _PROTO_ACTION_H */
+#endif /* _HAPROXY_ACTION_H */
diff --git a/include/proto/checks.h b/include/proto/checks.h
index f0ff52aa2..04c9eeb63 100644
--- a/include/proto/checks.h
+++ b/include/proto/checks.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_CHECKS_H
 #define _PROTO_CHECKS_H
 
-#include <types/action.h>
+#include <haproxy/action-t.h>
 #include <types/mailers.h>
 #include <types/checks.h>
 
diff --git a/include/proto/dns.h b/include/proto/dns.h
index 7ce5a098e..35eb2bf31 100644
--- a/include/proto/dns.h
+++ b/include/proto/dns.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_DNS_H
 #define _PROTO_DNS_H
 
-#include <types/action.h>
+#include <haproxy/action-t.h>
 #include <types/dns.h>
 
 extern struct list dns_resolvers;
diff --git a/include/proto/http_rules.h b/include/proto/http_rules.h
index 84f302dce..fd2db0108 100644
--- a/include/proto/http_rules.h
+++ b/include/proto/http_rules.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/list.h>
-#include <types/action.h>
+#include <haproxy/action-t.h>
 #include <types/proxy.h>
 
 extern struct action_kw_list http_req_keywords;
diff --git a/include/proto/proto_tcp.h b/include/proto/proto_tcp.h
index 347305bf3..29e6c1c2d 100644
--- a/include/proto/proto_tcp.h
+++ b/include/proto/proto_tcp.h
@@ -23,7 +23,6 @@
 #define _PROTO_PROTO_TCP_H
 
 #include <haproxy/api.h>
-#include <types/action.h>
 #include <types/task.h>
 #include <proto/stick_table.h>
 
diff --git a/include/proto/stream.h b/include/proto/stream.h
index ac555451e..bc93a2bc4 100644
--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@@ -22,9 +22,9 @@
 #ifndef _PROTO_STREAM_H
 #define _PROTO_STREAM_H
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/pool.h>
-#include <types/action.h>
 #include <types/stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
diff --git a/include/proto/tcp_rules.h b/include/proto/tcp_rules.h
index b9a4c932a..2059c0927 100644
--- a/include/proto/tcp_rules.h
+++ b/include/proto/tcp_rules.h
@@ -22,8 +22,8 @@
 #ifndef _PROTO_TCP_RULES_H
 #define _PROTO_TCP_RULES_H
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
-#include <types/action.h>
 #include <types/task.h>
 #include <proto/stick_table.h>
 
diff --git a/src/action.c b/src/action.c
index 17716b5ea..63c1188d7 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 0fa1c642f..ad34a9d0b 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 2f9ed1b84..050561153 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 b5c76fbf4..279e8af01 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 79a7a0d4c..d251674c9 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 52771ef13..4bb259e6e 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 cba3c7965..8bb98775b 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 d26b9a444..3ad3bcca9 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 77ac2cbe3..ba19e878e 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 9b109f425..c21d1c91a 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 e2e78802b..530be55c4 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 012bfd310..d6c1eb3fb 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>