REORG: htx: merge types+proto into common/htx.h
All the HTX definition is self-contained and doesn't really depend on
anything external since it's a mostly protocol. In addition, some
external similar files (like h2) also placed in common used to rely
on it, making it a bit awkward.
This patch moves the two htx.h files into a single self-contained one.
The historical dependency on sample.h could be also removed since it
used to be there only for http_meth_t which is now in http.h.
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 2d1a7fd..aaab32e 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -12,6 +12,7 @@
#include <common/buffer.h>
#include <common/cfgparse.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/mini-clist.h>
#include <common/standard.h>
@@ -26,7 +27,6 @@
#include <proto/filters.h>
#include <proto/hdr_idx.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/proto_http.h>
#include <proto/sample.h>
#include <proto/stream.h>