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/filters.c b/src/filters.c
index d082261..4f3fae7 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -16,6 +16,7 @@
#include <common/compat.h>
#include <common/config.h>
#include <common/errors.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/namespace.h>
#include <common/standard.h>
@@ -28,7 +29,6 @@
#include <proto/filters.h>
#include <proto/flt_http_comp.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/proto_http.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>