diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 50dc14f81..f0b1adf63 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -14,6 +14,7 @@
  */
 
 #include <haproxy/action-t.h>
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/frontend.h>
@@ -25,7 +26,6 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 
-#include <proto/applet.h>
 #include <proto/backend.h>
 #include <haproxy/compression.h>
 #include <haproxy/pipe.h>
diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h
index 9a7636674..59012fc76 100644
--- a/include/haproxy/action-t.h
+++ b/include/haproxy/action-t.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/regex-t.h>
 
-#include <types/applet.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/stick_table-t.h>
 
 enum act_from {
diff --git a/include/types/applet.h b/include/haproxy/applet-t.h
similarity index 96%
rename from include/types/applet.h
rename to include/haproxy/applet-t.h
index c32dd8eda..4323905db 100644
--- a/include/types/applet.h
+++ b/include/haproxy/applet-t.h
@@ -1,8 +1,8 @@
 /*
- * include/types/applet.h
+ * include/haproxy/applet-t.h
  * This file describes the applet struct and associated constants.
  *
- * Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,19 +19,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_APPLET_H
-#define _TYPES_APPLET_H
+#ifndef _HAPROXY_APPLET_T_H
+#define _HAPROXY_APPLET_T_H
 
-#include <haproxy/api-t.h>
-#include <haproxy/buf.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/obj_type-t.h>
+#include <haproxy/api-t.h>
 #include <haproxy/xref-t.h>
+
 #include <types/proxy.h>
 #include <types/stream.h>
 
+/* flags for appctx->state */
+#define APPLET_WANT_DIE     0x01  /* applet was running and requested to die */
+
 struct appctx;
 
 /* Applet descriptor */
@@ -46,12 +50,6 @@ struct applet {
 	unsigned int timeout;              /* execution timeout. */
 };
 
-#define APPLET_WANT_DIE     0x01  /* applet was running and requested to die */
-
-#define APPCTX_CLI_ST1_PROMPT  (1 << 0)
-#define APPCTX_CLI_ST1_PAYLOAD (1 << 1)
-#define APPCTX_CLI_ST1_NOLF    (1 << 2)
-
 /* Context of a running applet. */
 struct appctx {
 	enum obj_type obj_type;    /* OBJ_TYPE_APPCTX */
@@ -188,7 +186,7 @@ struct appctx {
 	} ctx;					/* context-specific variables used by any applet */
 };
 
-#endif /* _TYPES_APPLET_H */
+#endif /* _HAPROXY_APPLET_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/applet.h b/include/haproxy/applet.h
similarity index 96%
rename from include/proto/applet.h
rename to include/haproxy/applet.h
index 48437f5f5..00ef4f6be 100644
--- a/include/proto/applet.h
+++ b/include/haproxy/applet.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/applet.h
+ * include/haproxy/applet.h
  * This file contains applet function prototypes
  *
  * Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
@@ -19,22 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_APPLET_H
-#define _PROTO_APPLET_H
+#ifndef _HAPROXY_APPLET_H
+#define _HAPROXY_APPLET_H
 
 #include <stdlib.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <haproxy/pool.h>
 #include <haproxy/list.h>
-#include <types/applet.h>
+#include <haproxy/pool.h>
 #include <haproxy/task.h>
 
 extern unsigned int nb_applets;
 extern struct pool_head *pool_head_appctx;
 
 struct task *task_run_applet(struct task *t, void *context, unsigned short state);
-
 int appctx_buf_available(void *arg);
 
 
@@ -117,7 +116,7 @@ static inline void appctx_wakeup(struct appctx *appctx)
 	task_wakeup(appctx->t, TASK_WOKEN_OTHER);
 }
 
-#endif /* _PROTO_APPLET_H */
+#endif /* _HAPROXY_APPLET_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index 6f741e4de..d77717a93 100644
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -22,13 +22,13 @@
 #ifndef _HAPROXY_OBJ_TYPE_H
 #define _HAPROXY_OBJ_TYPE_H
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
-#include <types/applet.h>
 #include <types/proxy.h>
 #include <types/server.h>
 #include <types/stream.h>
diff --git a/include/proto/cli.h b/include/proto/cli.h
index 13490afb2..cbd3cd9d3 100644
--- a/include/proto/cli.h
+++ b/include/proto/cli.h
@@ -23,8 +23,8 @@
 #ifndef _PROTO_CLI_H
 #define _PROTO_CLI_H
 
+#include <haproxy/applet-t.h>
 #include <haproxy/global.h>
-#include <types/applet.h>
 #include <types/channel.h>
 #include <types/cli.h>
 #include <types/stream.h>
diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index 6a9aa555c..f5f0bf362 100644
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -22,11 +22,11 @@
 #ifndef _PROTO_PROXY_H
 #define _PROTO_PROXY_H
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-#include <types/applet.h>
 #include <haproxy/global-t.h>
 #include <types/proxy.h>
 #include <haproxy/freq_ctr.h>
diff --git a/include/proto/server.h b/include/proto/server.h
index b84be433f..4d78c1d27 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -24,10 +24,10 @@
 
 #include <unistd.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/time.h>
-#include <types/applet.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
diff --git a/include/proto/stats.h b/include/proto/stats.h
index f98a5ecec..84c64d03e 100644
--- a/include/proto/stats.h
+++ b/include/proto/stats.h
@@ -23,9 +23,9 @@
 #ifndef _PROTO_STATS_H
 #define _PROTO_STATS_H
 
+#include <haproxy/applet-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/api.h>
-#include <types/applet.h>
 #include <types/stream_interface.h>
 #include <types/stats.h>
 
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index e381d846e..f17e6aec0 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -24,11 +24,11 @@
 
 #include <stdlib.h>
 
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
 #include <types/stream.h>
 #include <types/stream_interface.h>
-#include <proto/applet.h>
 #include <proto/channel.h>
 
 
diff --git a/include/types/cli.h b/include/types/cli.h
index 41753c522..710e01433 100644
--- a/include/types/cli.h
+++ b/include/types/cli.h
@@ -20,8 +20,8 @@
 #ifndef _TYPES_CLI_H
 #define _TYPES_CLI_H
 
+#include <haproxy/applet-t.h>
 #include <haproxy/list-t.h>
-#include <types/applet.h>
 
 /* Access level for a stats socket */
 #define ACCESS_LVL_NONE     0
@@ -36,6 +36,11 @@
 
 #define ACCESS_EXPERT       0x20 /* access to dangerous commands reserved to experts */
 
+/* flags for appctx->st1 */
+#define APPCTX_CLI_ST1_PROMPT  (1 << 0)
+#define APPCTX_CLI_ST1_PAYLOAD (1 << 1)
+#define APPCTX_CLI_ST1_NOLF    (1 << 2)
+
 struct cli_kw {
 	const char *str_kw[5];   /* keywords ended by NULL, limited to 5
 				 separated keywords combination */
diff --git a/src/applet.c b/src/applet.c
index 510faad77..760ddc302 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -13,10 +13,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/list.h>
 #include <haproxy/task.h>
-#include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
diff --git a/src/cli.c b/src/cli.c
index 186aad424..e3b914dde 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -26,6 +26,7 @@
 
 #include <net/if.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/check.h>
@@ -45,7 +46,6 @@
 #include <haproxy/version.h>
 #include <haproxy/base64.h>
 
-#include <types/applet.h>
 #include <haproxy/global.h>
 #include <types/stats.h>
 
diff --git a/src/dns.c b/src/dns.c
index b49f62d84..9fc767d06 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -34,7 +34,6 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/vars.h>
 
-#include <types/applet.h>
 #include <types/cli.h>
 #include <haproxy/global.h>
 #include <types/stats.h>
diff --git a/src/hlua.c b/src/hlua.c
index bed059ca8..0d3a3e9ce 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -21,6 +21,7 @@
 #error "Requires Lua 5.3 or later."
 #endif
 
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <import/ebpttree.h>
 
@@ -51,7 +52,6 @@
 #include <types/stats.h>
 
 #include <haproxy/arg.h>
-#include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <proto/stats.h>
diff --git a/src/log.c b/src/log.c
index d9bbecd73..7b5a3574b 100644
--- a/src/log.c
+++ b/src/log.c
@@ -24,6 +24,7 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http.h>
@@ -35,7 +36,6 @@
 #include <haproxy/global.h>
 #include <types/log.h>
 
-#include <proto/applet.h>
 #include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
diff --git a/src/map.c b/src/map.c
index 7435fb1bc..77d687bb8 100644
--- a/src/map.c
+++ b/src/map.c
@@ -12,17 +12,16 @@
 
 #include <stdio.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/map.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 
-#include <types/applet.h>
 #include <types/cli.h>
 #include <types/stats.h>
 
-#include <proto/applet.h>
 #include <haproxy/arg.h>
 #include <proto/cli.h>
 #include <proto/log.h>
diff --git a/src/peers.c b/src/peers.c
index cba840d55..1d60e3f53 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -20,6 +20,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/dict.h>
 #include <haproxy/frontend.h>
@@ -35,7 +36,6 @@
 
 #include <types/stats.h>
 
-#include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <haproxy/fd.h>
diff --git a/src/pool.c b/src/pool.c
index 2f32b5872..1e8e2f863 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -11,8 +11,8 @@
  */
 #include <errno.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <types/applet.h>
 #include <types/cli.h>
 #include <haproxy/global.h>
 #include <types/stats.h>
@@ -25,7 +25,6 @@
 
 #include <haproxy/activity-t.h>
 
-#include <proto/applet.h>
 #include <proto/cli.h>
 #include <proto/channel.h>
 #include <proto/log.h>
diff --git a/src/proxy.c b/src/proxy.c
index c66927d07..b00ea01b0 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -17,6 +17,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
@@ -35,7 +36,6 @@
 #include <types/cli.h>
 #include <types/stats.h>
 
-#include <proto/applet.h>
 #include <proto/cli.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
diff --git a/src/ring.c b/src/ring.c
index 097225158..323249dc3 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -19,10 +19,10 @@
  */
 
 #include <stdlib.h>
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/thread.h>
-#include <types/applet.h>
 #include <proto/cli.h>
 #include <haproxy/ring.h>
 #include <proto/stream_interface.h>
diff --git a/src/server.c b/src/server.c
index 904cadb89..2e2ada887 100644
--- a/src/server.c
+++ b/src/server.c
@@ -14,6 +14,7 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <import/xxhash.h>
 
@@ -29,12 +30,10 @@
 #include <haproxy/task.h>
 #include <haproxy/time.h>
 
-#include <types/applet.h>
 #include <types/cli.h>
 #include <types/cli.h>
 #include <types/stats.h>
 
-#include <proto/applet.h>
 #include <proto/cli.h>
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 5cad3d656..308dbfacd 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -67,7 +67,6 @@
 #include <import/ebpttree.h>
 #include <import/ebsttree.h>
 
-#include <types/applet.h>
 #include <types/cli.h>
 #include <types/ssl_sock.h>
 #include <types/stats.h>
diff --git a/src/stats.c b/src/stats.c
index 0bb748182..b527eafda 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/check.h>
@@ -49,7 +50,6 @@
 #include <haproxy/version.h>
 #include <haproxy/base64.h>
 
-#include <types/applet.h>
 #include <types/cli.h>
 #include <types/stats.h>
 
diff --git a/src/stream.c b/src/stream.c
index ce41a2962..0dd4745b9 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
 #include <common/cfgparse.h>
@@ -37,7 +38,6 @@
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
-#include <types/applet.h>
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/stats.h>
diff --git a/src/stream_interface.c b/src/stream_interface.c
index a51fa14dd..5237954e6 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -19,6 +19,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
 #include <haproxy/dynbuf.h>
@@ -28,7 +29,6 @@
 #include <haproxy/time.h>
 #include <haproxy/task.h>
 
-#include <proto/applet.h>
 #include <proto/channel.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
diff --git a/src/tools.c b/src/tools.c
index fd7779555..a9ad82b6e 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -48,7 +48,6 @@
 #include <haproxy/namespace.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
-#include <proto/applet.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream_interface.h>