diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index e360a5a40..ea8932c6a 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -24,11 +24,9 @@
 
 #include <common/config.h>
 #include <common/htx.h>
+#include <types/channel.h>
 #include <types/proto_http.h>
 #include <types/stream.h>
-#include <types/task.h>
-#include <proto/channel.h>
-#include <proto/stream.h>
 
 extern struct pool_head *pool_head_uniqueid;
 
diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 295a98624..5125879aa 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -22,15 +22,10 @@
 #ifndef _TYPES_PROTO_HTTP_H
 #define _TYPES_PROTO_HTTP_H
 
-#include <common/buf.h>
 #include <common/config.h>
 #include <common/http.h>
-#include <common/mini-clist.h>
-#include <common/regex.h>
 
 #include <types/channel.h>
-#include <types/filters.h>
-//#include <types/sample.h>
 
 /* These are the flags that are found in txn->flags */
 
@@ -79,25 +74,6 @@
 /* used only for keep-alive purposes, to indicate we're on a second transaction */
 #define TX_NOT_FIRST	0x00040000	/* the transaction is not the first one */
 
-/* The HTTP parser is more complex than it looks like, because we have to
- * support multi-line headers and any number of spaces between the colon and
- * the value.
- *
- * All those examples must work :
-
- Hdr1:val1\r\n
- Hdr1: val1\r\n
- Hdr1:\t val1\r\n
- Hdr1: \r\n
-  val1\r\n
- Hdr1:\r\n
-  val1\n
- \tval2\r\n
-  val3\n
-
- *
- */
-
 /*
  * HTTP message status flags (msg->flags)
  */
diff --git a/src/http_fetch.c b/src/http_fetch.c
index c2dd9b5f1..cdf1c0e71 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -33,6 +33,7 @@
 
 #include <proto/arg.h>
 #include <proto/auth.h>
+#include <proto/channel.h>
 #include <proto/http_fetch.h>
 #include <proto/http_htx.h>
 #include <proto/log.h>