[master] 47649ea Reduce visibility of waiters

[Poul-Henning Kamp]

commit 47649ea0c642855eed4b450189b5b18c071452e6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Sep 23 21:57:08 2017 +0000

    Reduce visibility of waiters

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index f970f53..cd3b2a0 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -40,8 +40,6 @@
 
 #include "vapi/vsl_int.h"
 
-#include "waiter/waiter.h"
-
 #include <sys/socket.h>
 
 #include <pthread.h>
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index b9d6829..35f1cdb 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -39,6 +39,7 @@
 #include "vrt.h"
 #include "vtcp.h"
 #include "vtim.h"
+#include "waiter/waiter.h"
 
 #include "cache_director.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 04d65ba..22d10c4 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -32,16 +32,17 @@
 
 #include "config.h"
 
-#include "cache.h"
-
 #include <fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cache.h"
+
 #include "vcli_serve.h"
 #include "vrt.h"
 #include "vcl.h"
 #include "vtim.h"
+#include "waiter/waiter.h"
 
 #include "cache_director.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 75a49a5..c1935dd 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -37,18 +37,19 @@
 
 #include "config.h"
 
-#include "cache.h"
-
 #include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cache.h"
+
 #include "binary_heap.h"
 #include "vcli_serve.h"
 #include "vrt.h"
 #include "vsa.h"
 #include "vtcp.h"
 #include "vtim.h"
+#include "waiter/waiter.h"
 
 #include "cache_director.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index 8f8a772..b13a4aa 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -42,6 +42,7 @@
 #include "vsa.h"
 #include "vtcp.h"
 #include "vtim.h"
+#include "waiter/waiter.h"
 
 #include "cache_director.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 6601b29..6e5a660 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -42,6 +42,8 @@
 
 #include "cache_filter.h"
 #include "common/heritage.h"
+#include "waiter/waiter.h"
+
 
 #include "vrt.h"
 #include "cache_director.h"
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 02e1059..ea18156 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -48,6 +48,7 @@
 #include "vsa.h"
 #include "vtcp.h"
 #include "vtim.h"
+#include "waiter/waiter.h"
 
 /*--------------------------------------------------------------------*/
 
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index ac7c4d8..004e217 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -30,15 +30,16 @@
 
 #include "config.h"
 
-#include "cache.h"
-
 #include <errno.h>
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cache.h"
+
 #include "vrt.h"
 #include "vcl.h"
+#include "waiter/waiter.h"
 
 #include "cache_director.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index 3d4b17d..80a2f1f 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -36,6 +36,7 @@
 
 #include "binary_heap.h"
 
+#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 358d2be..129bb87 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -41,6 +41,7 @@
 
 #include "cache/cache.h"
 
+#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index ff870e7..50bdad3 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -39,6 +39,7 @@
 
 #include <stdlib.h>
 
+#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 52e4de3..fefe22f 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -36,6 +36,7 @@
 
 #include "cache/cache.h"
 
+#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 3a1dc49..a7f76c9 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -75,6 +75,7 @@
 
 #include "cache/cache.h"
 
+#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"