diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index c64385cdf..63d691962 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -16,6 +16,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/frontend.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -27,7 +28,6 @@
 #include <proto/applet.h>
 #include <proto/backend.h>
 #include <haproxy/compression.h>
-#include <proto/frontend.h>
 #include <proto/listener.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
diff --git a/include/proto/frontend.h b/include/haproxy/frontend.h
similarity index 87%
rename from include/proto/frontend.h
rename to include/haproxy/frontend.h
index 37d484cf9..114d87724 100644
--- a/include/proto/frontend.h
+++ b/include/haproxy/frontend.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/frontend.h
+ * include/haproxy/frontend.h
  * This file declares frontend-specific functions.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,16 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_FRONTEND_H
-#define _PROTO_FRONTEND_H
+#ifndef _HAPROXY_FRONTEND_H
+#define _HAPROXY_FRONTEND_H
 
-#include <haproxy/api.h>
 #include <types/stream.h>
 
 int frontend_accept(struct stream *s);
 
 
-#endif /* _PROTO_FRONTEND_H */
+#endif /* _HAPROXY_FRONTEND_H */
 
 /*
  * Local variables:
diff --git a/src/backend.c b/src/backend.c
index 716905811..cab39c898 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
+#include <haproxy/frontend.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
@@ -35,7 +36,6 @@
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
-#include <proto/frontend.h>
 #include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index bf2373bf4..e1d2394cf 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -41,6 +41,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/frontend.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
@@ -61,7 +62,6 @@
 #include <proto/checks.h>
 #include <proto/stats.h>
 #include <proto/filters.h>
-#include <proto/frontend.h>
 #include <proto/http_rules.h>
 #include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
diff --git a/src/cli.c b/src/cli.c
index 7f51a9b36..71e37f79d 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -29,6 +29,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/dns-t.h>
+#include <haproxy/frontend.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -50,7 +51,6 @@
 #include <proto/stats.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/frontend.h>
 #include <proto/log.h>
 #include <proto/pattern.h>
 #include <haproxy/pipe.h>
diff --git a/src/connection.c b/src/connection.c
index d7c77d287..afe881cd9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -14,13 +14,13 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/frontend.h>
 #include <haproxy/namespace.h>
 #include <haproxy/hash.h>
 #include <haproxy/net_helper.h>
 
 #include <proto/connection.h>
 #include <haproxy/fd.h>
-#include <proto/frontend.h>
 #include <proto/proto_tcp.h>
 #include <proto/stream_interface.h>
 #include <proto/sample.h>
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 91915233b..7fe44cf48 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -15,6 +15,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/frontend.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
@@ -28,7 +29,6 @@
 #include <proto/backend.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/frontend.h>
 #include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
diff --git a/src/frontend.c b/src/frontend.c
index a71dc091d..0be29292d 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -24,6 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
+#include <haproxy/frontend.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
@@ -33,7 +34,6 @@
 #include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <haproxy/fd.h>
-#include <proto/frontend.h>
 #include <proto/log.h>
 #include <proto/proto_tcp.h>
 #include <proto/http_ana.h>
diff --git a/src/log.c b/src/log.c
index 77eb2c6f9..7c62f6dfa 100644
--- a/src/log.c
+++ b/src/log.c
@@ -25,6 +25,7 @@
 #include <sys/uio.h>
 
 #include <haproxy/api.h>
+#include <haproxy/frontend.h>
 #include <haproxy/http.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@@ -37,7 +38,6 @@
 #include <proto/applet.h>
 #include <proto/cli.h>
 #include <haproxy/fd.h>
-#include <proto/frontend.h>
 #include <proto/log.h>
 #include <haproxy/ring.h>
 #include <proto/sample.h>
diff --git a/src/peers.c b/src/peers.c
index 4d16b41a4..f4513a5d6 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -22,6 +22,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/dict.h>
+#include <haproxy/frontend.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
@@ -38,7 +39,6 @@
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <haproxy/fd.h>
-#include <proto/frontend.h>
 #include <proto/log.h>
 #include <proto/mux_pt.h>
 #include <proto/peers.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 45981cf38..d04de1c6b 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -47,6 +47,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
+#include <haproxy/frontend.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/shctx.h>
 #include <haproxy/tools.h>
@@ -70,7 +71,6 @@
 #include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/frontend.h>
 #include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/pattern.h>
diff --git a/src/stats.c b/src/stats.c
index 8f6787489..79fff9062 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -29,6 +29,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/debug.h>
 #include <haproxy/dns.h>
+#include <haproxy/frontend.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -53,7 +54,6 @@
 #include <proto/stats.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/frontend.h>
 #include <proto/log.h>
 #include <proto/pattern.h>
 #include <haproxy/pipe.h>
diff --git a/src/stream.c b/src/stream.c
index 4bd8d517b..57a0d91c2 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -21,6 +21,7 @@
 #include <haproxy/dict.h>
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/frontend.h>
 #include <haproxy/hlua.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
@@ -45,7 +46,6 @@
 #include <haproxy/fd.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/frontend.h>
 #include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>