diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c
index 905cc2f2a..15136a3b4 100644
--- a/contrib/debug/flags.c
+++ b/contrib/debug/flags.c
@@ -3,7 +3,7 @@
 
 #include <haproxy/channel-t.h>
 #include <haproxy/connection-t.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
 #include <types/stream.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task-t.h>
diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index 0f992236e..f363326a8 100644
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -33,7 +33,6 @@
 #include <haproxy/regex-t.h>
 #include <haproxy/xref-t.h>
 
-#include <types/http_ana.h>
 #include <types/proxy.h>
 #include <types/server.h>
 #include <haproxy/stick_table-t.h>
diff --git a/include/types/http_ana.h b/include/haproxy/http_ana-t.h
similarity index 97%
rename from include/types/http_ana.h
rename to include/haproxy/http_ana-t.h
index 6ebe772bf..16119249a 100644
--- a/include/types/http_ana.h
+++ b/include/haproxy/http_ana-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/http_ana.h
+ * include/haproxy/http_ana-t.h
  * This file contains HTTP protocol definitions.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,13 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_PROTO_HTTP_H
-#define _TYPES_PROTO_HTTP_H
+#ifndef _HAPROXY_PROTO_HTTP_T_H
+#define _HAPROXY_PROTO_HTTP_T_H
 
 #include <haproxy/channel-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/http-t.h>
-#include <haproxy/http_htx-t.h>
+#include <haproxy/api-t.h>
 
 /* These are the flags that are found in txn->flags */
 
@@ -186,9 +185,7 @@ struct http_txn {
 	struct http_auth_data auth;	/* HTTP auth data */
 };
 
-extern struct pool_head *pool_head_http_txn;
-
-#endif /* _TYPES_PROTO_HTTP_H */
+#endif /* _HAPROXY_PROTO_HTTP_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/http_ana.h b/include/haproxy/http_ana.h
similarity index 94%
rename from include/proto/http_ana.h
rename to include/haproxy/http_ana.h
index 8648865dd..6bf4a5a2b 100644
--- a/include/proto/http_ana.h
+++ b/include/haproxy/http_ana.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/http_ana.h
+ * include/haproxy/http_ana.h
  * This file contains HTTP protocol definitions.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROTO_HTTP_H
-#define _PROTO_PROTO_HTTP_H
+#ifndef _HAPROXY_PROTO_HTTP_H
+#define _HAPROXY_PROTO_HTTP_H
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
-#include <haproxy/htx.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
+#include <haproxy/htx-t.h>
 #include <types/stream.h>
 
 extern struct pool_head *pool_head_uniqueid;
+extern struct pool_head *pool_head_http_txn;
 
 int http_wait_for_request(struct stream *s, struct channel *req, int an_bit);
 int http_process_req_common(struct stream *s, struct channel *req, int an_bit, struct proxy *px);
@@ -78,7 +79,7 @@ static inline const char *h1_msg_state_str(enum h1_state msg_state)
 	}
 }
 
-#endif /* _PROTO_PROTO_HTTP_H */
+#endif /* _HAPROXY_PROTO_HTTP_H */
 
 /*
  * Local variables:
diff --git a/include/proto/filters.h b/include/proto/filters.h
index 9e8cc74f8..4b8876ea8 100644
--- a/include/proto/filters.h
+++ b/include/proto/filters.h
@@ -23,7 +23,7 @@
 
 #include <haproxy/channel.h>
 #include <types/filters.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
diff --git a/include/types/stream.h b/include/types/stream.h
index 2a5fb77f4..99dfd02ec 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -32,6 +32,7 @@
 #include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/hlua-t.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/session-t.h>
@@ -39,7 +40,6 @@
 #include <haproxy/vars-t.h>
 
 #include <types/filters.h>
-#include <types/http_ana.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
diff --git a/src/51d.c b/src/51d.c
index 3bdc5bf61..37124ea37 100644
--- a/src/51d.c
+++ b/src/51d.c
@@ -5,13 +5,13 @@
 #include <haproxy/chunk.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 #include <import/xxhash.h>
 #include <import/lru.h>
diff --git a/src/backend.c b/src/backend.c
index d4805d741..f79ac18e5 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -26,6 +26,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/lb_chash.h>
@@ -49,7 +50,6 @@
 #include <proto/backend.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
diff --git a/src/cache.c b/src/cache.c
index 80bc545d4..36c54a880 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -14,6 +14,7 @@
 #include <haproxy/api.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/shctx.h>
@@ -26,7 +27,6 @@
 
 #include <proto/proxy.h>
 #include <proto/filters.h>
-#include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 15f768eec..e5cac8b11 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -46,6 +46,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/lb_chash.h>
 #include <haproxy/lb_fas.h>
@@ -73,7 +74,6 @@
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <haproxy/peers.h>
 #include <haproxy/sample.h>
diff --git a/src/da.c b/src/da.c
index ab36fa932..1d62ade4a 100644
--- a/src/da.c
+++ b/src/da.c
@@ -4,12 +4,13 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 #include <dac.h>
 
diff --git a/src/dns.c b/src/dns.c
index 54c078009..7658f6f84 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -41,7 +41,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
diff --git a/src/filters.c b/src/filters.c
index de5d9f276..130f5d71a 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -15,6 +15,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/flt_http_comp.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/namespace.h>
@@ -22,11 +23,10 @@
 #include <haproxy/tools.h>
 
 #include <types/filters.h>
-#include <types/http_ana.h>
 
 #include <haproxy/compression.h>
 #include <proto/filters.h>
-#include <proto/http_ana.h>
+#include <haproxy/http_ana.h>
 #include <proto/stream.h>
 
 #define TRACE_SOURCE &trace_strm
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 5ab6a01c7..0fb213d08 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -14,6 +14,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <common/cfgparse.h>
 #include <haproxy/htx.h>
@@ -25,7 +26,6 @@
 #include <types/proxy.h>
 
 #include <proto/filters.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 const char *http_comp_flt_id = "compression filter";
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index d483ba53a..9e9eaeb8f 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -38,7 +38,6 @@
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
diff --git a/src/flt_trace.c b/src/flt_trace.c
index aaf63d37f..125401a38 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -14,6 +14,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/tools.h>
@@ -26,7 +27,6 @@
 
 #include <proto/filters.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 const char *trace_flt_id = "trace filter";
diff --git a/src/frontend.c b/src/frontend.c
index 63ab35699..09adbea15 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -26,6 +26,7 @@
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -38,7 +39,6 @@
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 
diff --git a/src/haproxy.c b/src/haproxy.c
index 44e4ff32b..6370d8e59 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -126,7 +126,6 @@
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
diff --git a/src/hlua.c b/src/hlua.c
index fbca16f64..afff59a02 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -36,6 +36,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/map.h>
@@ -55,7 +56,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/queue.h>
-#include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/stream.h>
 
diff --git a/src/http_act.c b/src/http_act.c
index 4c283283d..06ab3c271 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -23,6 +23,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pattern.h>
@@ -38,7 +39,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 
 /* Release memory allocated by most of HTTP actions. Concretly, it releases
  * <arg.http>.
diff --git a/src/http_ana.c b/src/http_ana.c
index ee43a69e7..6e15d6730 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -18,6 +18,7 @@
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
@@ -31,7 +32,6 @@
 
 #include <proto/filters.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stream.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 7209fc669..65fbe877e 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -26,6 +26,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -37,7 +38,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 
diff --git a/src/http_rules.c b/src/http_rules.c
index 6864e5ea3..40ffb7135 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -30,7 +30,6 @@
 #include <haproxy/capture-t.h>
 
 #include <haproxy/arg.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 
 
diff --git a/src/payload.c b/src/payload.c
index c84a124f8..d9b31072b 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -23,7 +23,6 @@
 #include <haproxy/htx.h>
 #include <haproxy/arg.h>
 #include <haproxy/sample.h>
-#include <proto/http_ana.h>
 
 
 /************************************************************************/
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index e25bbdb84..b25779ccd 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -50,7 +50,6 @@
 #include <proto/log.h>
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
diff --git a/src/proxy.c b/src/proxy.c
index 11f340d0a..803f1868a 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -23,6 +23,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/listener.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
@@ -42,7 +43,6 @@
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/signal.h>
diff --git a/src/queue.c b/src/queue.c
index 3b5d0ef4c..6e9976966 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -80,7 +80,6 @@
 #include <haproxy/thread.h>
 #include <import/eb32tree.h>
 
-#include <proto/http_ana.h>
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 6ce493a60..a586b6255 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -76,7 +76,6 @@
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index 6bf6cd9a9..3a8d62f44 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -35,7 +35,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
diff --git a/src/stream.c b/src/stream.c
index 6ec17947f..010509fb5 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -30,6 +30,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
@@ -53,7 +54,6 @@
 #include <proto/log.h>
 #include <proto/stream.h>
 #include <haproxy/pipe.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
diff --git a/src/vars.c b/src/vars.c
index 4a3b4574f..b26d60f2b 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -11,7 +11,6 @@
 #include <haproxy/vars.h>
 
 #include <haproxy/arg.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 /* This contains a pool of struct vars */
diff --git a/src/wurfl.c b/src/wurfl.c
index 01cce0d8c..f7992e53c 100644
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -7,11 +7,11 @@
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 #include <import/ebsttree.h>
 #include <import/ebmbtree.h>