From 30925659ef21de786e3bf0dbf1013b9ce871d9ba Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Tue, 11 Dec 2018 11:11:37 +0100
Subject: [PATCH] CLEANUP: h1: remove some occurrences of unneeded h1.h
 inclusions

Several places where h1.h was included didn't need it at all since
they in fact relied on the legacy HTTP definitions.
---
 include/proto/http_htx.h   | 1 -
 include/proto/proto_http.h | 1 -
 include/types/proto_http.h | 1 -
 src/flt_http_comp.c        | 1 -
 src/flt_trace.c            | 1 -
 src/hlua_fcn.c             | 1 -
 src/http_fetch.c           | 1 +
 src/log.c                  | 1 -
 8 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/proto/http_htx.h b/include/proto/http_htx.h
index 7a2e008ae..6028292d2 100644
--- a/include/proto/http_htx.h
+++ b/include/proto/http_htx.h
@@ -26,7 +26,6 @@
 #include <common/buf.h>
 #include <common/ist.h>
 
-#include <types/h1.h>
 #include <types/http_htx.h>
 
 extern struct buffer htx_err_chunks[HTTP_ERR_SIZE];
diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index db85fae8c..1d210336f 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -27,7 +27,6 @@
 #include <types/stream.h>
 #include <types/task.h>
 #include <proto/channel.h>
-#include <proto/h1.h>
 
 #define IS_HTX_STRM(strm) (strm_fe(strm)->options2 & PR_O2_USE_HTX)
 #define IS_HTX_SMP(smp)   ((smp)->strm && IS_HTX_STRM((smp)->strm))
diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 972a6d330..21910a91e 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -29,7 +29,6 @@
 #include <common/regex.h>
 
 #include <types/channel.h>
-#include <types/h1.h>
 #include <types/hdr_idx.h>
 #include <types/filters.h>
 //#include <types/sample.h>
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index aaab32e72..74a8ae72a 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -19,7 +19,6 @@
 
 #include <types/compression.h>
 #include <types/filters.h>
-#include <types/h1.h>
 #include <types/proxy.h>
 #include <types/sample.h>
 
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 1daeb22b9..3cfd842ce 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -22,7 +22,6 @@
 #include <types/channel.h>
 #include <types/filters.h>
 #include <types/global.h>
-#include <types/h1.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index f977d64a0..472fb0c71 100644
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -26,7 +26,6 @@
 #include <types/proxy.h>
 #include <types/stats.h>
 
-#include <proto/h1.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stats.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 14b8ba239..5f6cb6cfe 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -32,6 +32,7 @@
 
 #include <proto/arg.h>
 #include <proto/auth.h>
+#include <proto/h1.h>
 #include <proto/hdr_idx.h>
 #include <proto/http_fetch.h>
 #include <proto/http_htx.h>
diff --git a/src/log.c b/src/log.c
index 3093ccea3..6c6efedae 100644
--- a/src/log.c
+++ b/src/log.c
@@ -37,7 +37,6 @@
 #include <proto/applet.h>
 #include <proto/cli.h>
 #include <proto/frontend.h>
-#include <proto/h1.h>
 #include <proto/log.h>
 #include <proto/sample.h>
 #include <proto/stream.h>