diff --git a/include/proto/tcp_rules.h b/include/haproxy/tcp_rules.h
similarity index 89%
rename from include/proto/tcp_rules.h
rename to include/haproxy/tcp_rules.h
index 5f12c264d..33eb69bd5 100644
--- a/include/proto/tcp_rules.h
+++ b/include/haproxy/tcp_rules.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/tcp_rules.h
+ * include/haproxy/tcp_rules.h
  * This file contains "tcp" rules definitions
  *
  * Copyright (C) 2000-2016 Willy Tarreau - w@1wt.eu
@@ -19,12 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_TCP_RULES_H
-#define _PROTO_TCP_RULES_H
+#ifndef _HAPROXY_TCP_RULES_H
+#define _HAPROXY_TCP_RULES_H
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
-#include <proto/stick_table.h>
+#include <types/stream.h>
+#include <types/session.h>
 
 int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit);
 int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit);
@@ -36,7 +37,7 @@ void tcp_req_sess_keywords_register(struct action_kw_list *kw_list);
 void tcp_req_cont_keywords_register(struct action_kw_list *kw_list);
 void tcp_res_cont_keywords_register(struct action_kw_list *kw_list);
 
-#endif /* _PROTO_TCP_RULES_H */
+#endif /* _HAPROXY_TCP_RULES_H */
 
 /*
  * Local variables:
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 7fc6fd5cd..970b60f11 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -80,7 +80,7 @@
 #include <proto/server.h>
 #include <proto/stream.h>
 #include <proto/stick_table.h>
-#include <proto/tcp_rules.h>
+#include <haproxy/tcp_rules.h>
 #include <proto/connection.h>
 
 
diff --git a/src/dns.c b/src/dns.c
index dca257561..35f12d320 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -27,6 +27,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/sample.h>
 #include <haproxy/task.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
 #include <haproxy/ticks.h>
 #include <haproxy/net_helper.h>
@@ -47,7 +48,6 @@
 #include <haproxy/proto_udp.h>
 #include <proto/proxy.h>
 #include <proto/stream_interface.h>
-#include <proto/tcp_rules.h>
 
 struct list dns_resolvers  = LIST_HEAD_INIT(dns_resolvers);
 struct list dns_srvrq_list = LIST_HEAD_INIT(dns_srvrq_list);
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index b08658789..c0371abba 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -22,6 +22,7 @@
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/task.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
 #include <haproxy/vars.h>
 
@@ -41,7 +42,6 @@
 #include <proto/spoe.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <proto/tcp_rules.h>
 
 #if defined(DEBUG_SPOE) || defined(DEBUG_FULL)
 #define SPOE_PRINTF(x...) fprintf(x)
diff --git a/src/hlua.c b/src/hlua.c
index 4ef94d179..adb531632 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -39,6 +39,7 @@
 #include <haproxy/payload.h>
 #include <haproxy/sample.h>
 #include <haproxy/task.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
@@ -59,7 +60,6 @@
 #include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <proto/tcp_rules.h>
 
 /* Lua uses longjmp to perform yield or throwing errors. This
  * macro is used only for identifying the function that can
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 2568d1014..e43eaf763 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -55,7 +55,7 @@
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/tcp_rules.h>
+#include <haproxy/tcp_rules.h>
 
 static int tcp_bind_listeners(struct protocol *proto, char *errmsg, int errlen);
 static int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen);
diff --git a/src/queue.c b/src/queue.c
index 5c8f790af..b863d645a 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -74,6 +74,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/sample.h>
 #include <haproxy/task.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
 #include <haproxy/thread.h>
 #include <import/eb32tree.h>
@@ -83,7 +84,6 @@
 #include <proto/server.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <proto/tcp_rules.h>
 
 
 #define NOW_OFFSET_BOUNDARY()          ((now_ms - (TIMER_LOOK_BACK >> 12)) & 0xfffff)
diff --git a/src/session.c b/src/session.c
index 92041f5f5..efc133570 100644
--- a/src/session.c
+++ b/src/session.c
@@ -15,6 +15,7 @@
 #include <haproxy/http.h>
 #include <haproxy/listener.h>
 #include <haproxy/pool.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
 #include <types/session.h>
@@ -24,7 +25,6 @@
 #include <proto/proxy.h>
 #include <proto/session.h>
 #include <proto/stream.h>
-#include <proto/tcp_rules.h>
 
 DECLARE_POOL(pool_head_session, "session", sizeof(struct session));
 DECLARE_POOL(pool_head_sess_srv_list, "session server list",
diff --git a/src/stick_table.c b/src/stick_table.c
index c57269b74..aad4071a6 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -22,6 +22,7 @@
 #include <haproxy/list.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/task.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
@@ -42,7 +43,6 @@
 #include <proto/stream_interface.h>
 #include <proto/stick_table.h>
 #include <proto/peers.h>
-#include <proto/tcp_rules.h>
 
 /* structure used to return a table key built from a sample */
 static THREAD_LOCAL struct stktable_key static_table_key;
diff --git a/src/stream.c b/src/stream.c
index 3780939f4..c3199230f 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -30,6 +30,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/task.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
 #include <types/applet.h>
@@ -59,7 +60,6 @@
 #include <proto/server.h>
 #include <proto/stick_table.h>
 #include <proto/stream_interface.h>
-#include <proto/tcp_rules.h>
 
 DECLARE_POOL(pool_head_stream, "stream", sizeof(struct stream));
 DECLARE_POOL(pool_head_uniqueid, "uniqueid", UNIQUEID_LEN);
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index e2f8a2950..1820ce51f 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -16,6 +16,7 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/sample.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -31,7 +32,6 @@
 #include <proto/stick_table.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <proto/tcp_rules.h>
 
 #define TRACE_SOURCE &trace_strm
 
diff --git a/src/vars.c b/src/vars.c
index b9aea6ad6..d2c87ded7 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -6,12 +6,12 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 #include <haproxy/sample.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
 #include <haproxy/arg.h>
 #include <proto/http_ana.h>
 #include <proto/stream.h>
-#include <proto/tcp_rules.h>
 #include <proto/checks.h>
 
 /* This contains a pool of struct vars */