diff --git a/src/applet.c b/src/applet.c
index 510faad..760ddc3 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 186aad4..e3b914d 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 b49f62d..9fc767d 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 bed059c..0d3a3e9 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 d9bbecd..7b5a357 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 7435fb1..77d687b 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 cba840d..1d60e3f 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 2f32b58..1e8e2f8 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 c66927d..b00ea01 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 0972251..323249d 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 904cadb..2e2ada8 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 5cad3d6..308dbfa 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 0bb7481..b527eaf 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 ce41a29..0dd4745 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 a51fa14..5237954 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 fd77795..a9ad82b 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>