diff --git a/include/types/http_htx.h b/include/haproxy/http_htx-t.h
similarity index 95%
rename from include/types/http_htx.h
rename to include/haproxy/http_htx-t.h
index b3af77e..dd3b238 100644
--- a/include/types/http_htx.h
+++ b/include/haproxy/http_htx-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/http_htx.h
+ * include/haproxy/http_htx-t.h
  * This file defines everything related to HTTP manipulation using the internal
  * representation.
  *
@@ -20,15 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_HTTP_HTX_H
-#define _TYPES_HTTP_HTX_H
+#ifndef _HAPROXY_HTTP_HTX_T_H
+#define _HAPROXY_HTTP_HTX_T_H
 
 #include <import/ebistree.h>
 
 #include <haproxy/buf-t.h>
+#include <import/ist.h>
 #include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
-#include <import/ist.h>
+#include <haproxy/list-t.h>
 
 /* Context used to find/remove an HTTP header. */
 struct http_hdr_ctx {
@@ -92,4 +93,4 @@
 	struct list list;                     /* http-errors list */
 };
 
-#endif /* _TYPES_HTTP_HTX_H */
+#endif /* _HAPROXY_HTTP_HTX_T_H */
diff --git a/include/proto/http_htx.h b/include/haproxy/http_htx.h
similarity index 94%
rename from include/proto/http_htx.h
rename to include/haproxy/http_htx.h
index d480be8..775037b 100644
--- a/include/proto/http_htx.h
+++ b/include/haproxy/http_htx.h
@@ -1,5 +1,5 @@
 /*
- * include/types/http_htx.h
+ * include/haproxy/http_htx-t.h
  * This file defines function prototypes for HTTP manipulation using the
  * internal representation.
  *
@@ -20,14 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_HTTP_HTX_H
-#define _PROTO_HTTP_HTX_H
+#ifndef _HAPROXY_HTTP_HTX_H
+#define _HAPROXY_HTTP_HTX_H
 
-#include <haproxy/buf.h>
 #include <import/ist.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/http_htx-t.h>
 #include <haproxy/regex-t.h>
-
-#include <types/http_htx.h>
+#include <types/proxy.h>
 
 extern struct buffer http_err_chunks[HTTP_ERR_SIZE];
 extern struct http_reply http_err_replies[HTTP_ERR_SIZE];
@@ -73,4 +73,4 @@
 int proxy_dup_default_conf_errors(struct proxy *curpx, struct proxy *defpx, char **errmsg);
 void proxy_release_conf_errors(struct proxy *px);
 
-#endif /* _PROTO_HTTP_HTX_H */
+#endif /* _HAPROXY_HTTP_HTX_H */
diff --git a/include/types/action.h b/include/types/action.h
index a102b2b..c70fcf7 100644
--- a/include/types/action.h
+++ b/include/types/action.h
@@ -26,7 +26,6 @@
 
 #include <types/applet.h>
 #include <types/stick_table.h>
-#include <types/http_htx.h>
 
 enum act_from {
 	ACT_F_TCP_REQ_CON, /* tcp-request connection */
diff --git a/include/types/http_ana.h b/include/types/http_ana.h
index 4a1a9cd..4dd8e33 100644
--- a/include/types/http_ana.h
+++ b/include/types/http_ana.h
@@ -26,7 +26,7 @@
 #include <haproxy/http-t.h>
 
 #include <types/channel.h>
-#include <types/http_htx.h>
+#include <haproxy/http_htx-t.h>
 
 /* These are the flags that are found in txn->flags */