[master] 2e247f5 Rearrange #includes to get vrt.h before cache_backend.h

[Poul-Henning Kamp]

commit 2e247f5248e24da00e2f983135dbd67a5098bfa3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jun 22 20:22:16 2015 +0000

    Rearrange #includes to get vrt.h before cache_backend.h

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index a057a14..789655f 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -36,11 +36,12 @@
 
 #include "cache.h"
 
-#include "cache_director.h"
-#include "cache_backend.h"
 #include "vrt.h"
 #include "vtcp.h"
 
+#include "cache_director.h"
+#include "cache_backend.h"
+
 #define FIND_TMO(tmx, dst, bo, be)					\
 	do {								\
 		CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);			\
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 15332a1..b3766cd 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -39,15 +39,15 @@
 #include "cache.h"
 
 #include "vcl.h"
-#include "vrt.h"
-
-#include "cache_director.h"
-#include "cache_backend.h"
 #include "vcli.h"
 #include "vcli_priv.h"
+#include "vrt.h"
 #include "vsa.h"
 #include "vtim.h"
 
+#include "cache_director.h"
+#include "cache_backend.h"
+
 static VTAILQ_HEAD(, backend) backends = VTAILQ_HEAD_INITIALIZER(backends);
 static struct lock backends_mtx;
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_backend_poll.c b/bin/varnishd/cache/cache_backend_poll.c
index fe6d735..d88f6e8 100644
--- a/bin/varnishd/cache/cache_backend_poll.c
+++ b/bin/varnishd/cache/cache_backend_poll.c
@@ -41,17 +41,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "binary_heap.h"
-
 #include "cache.h"
 
-#include "cache_director.h"
-#include "cache_backend.h"
+#include "binary_heap.h"
 #include "vcli_priv.h"
 #include "vrt.h"
-#include "vtim.h"
-#include "vtcp.h"
 #include "vsa.h"
+#include "vtcp.h"
+#include "vtim.h"
+
+#include "cache_director.h"
+#include "cache_backend.h"
 
 /* Default averaging rate, we want something pretty responsive */
 #define AVG_RATE			4
diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index c830fa5..c9d57d1 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -38,12 +38,14 @@
 
 #include "cache.h"
 
+#include "vrt.h"
+#include "vsa.h"
+#include "vtcp.h"
+#include "vtim.h"
+
 #include "cache_director.h"
 #include "cache_backend.h"
 #include "cache_pool.h"
-#include "vtcp.h"
-#include "vsa.h"
-#include "vtim.h"
 
 struct tcp_pool {
 	unsigned		magic;
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index b959ff6..8412d30 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -40,9 +40,11 @@
 #include <signal.h>
 
 #include "cache.h"
+
 #include "cache_filter.h"
 #include "common/heritage.h"
 
+#include "vrt.h"
 #include "cache_director.h"
 #include "cache_backend.h"
 #include "storage/storage.h"
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 1eae475..106fd03 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -35,13 +35,15 @@
 
 #include "cache/cache.h"
 
+#include "vcli_priv.h"
+#include "vrt.h"
+#include "vtcp.h"
+#include "vtim.h"
+
 #include "hash/hash_slinger.h"
 
 #include "cache/cache_director.h"
 #include "cache/cache_backend.h"
-#include "vcli_priv.h"
-#include "vtcp.h"
-#include "vtim.h"
 
 /*--------------------------------------------------------------------
  * Pass the request body to the backend
diff --git a/bin/varnishd/http1/cache_http1_pipe.c b/bin/varnishd/http1/cache_http1_pipe.c
index bf7ab67..45b137d 100644
--- a/bin/varnishd/http1/cache_http1_pipe.c
+++ b/bin/varnishd/http1/cache_http1_pipe.c
@@ -36,11 +36,13 @@
 
 #include "cache/cache.h"
 
-#include "cache/cache_director.h"
-#include "cache/cache_backend.h"
+#include "vrt.h"
 #include "vtcp.h"
 #include "vtim.h"
 
+#include "cache/cache_director.h"
+#include "cache/cache_backend.h"
+
 static struct lock pipestat_mtx;
 
 struct acct_pipe {