Concentrate waiter stuff in waiter includes

bin/varnishd/cache/cache.h

@@ -41,6 +41,8 @@
 #include "vapi/vsl_int.h"
 #include "vapi/vsm_int.h"
 
+#include "waiter/waiter.h"
+
 #include <sys/socket.h>
 
 #include <pthread.h>
@@ -366,19 +368,6 @@ struct lru {
 	unsigned		n_objcore;
 };
 
-/* Connection waiter -------------------------------------------------
- * Describing a file-descriptor/connection being waited on
- */
-
-struct waited {
-	unsigned		magic;
-#define WAITED_MAGIC		0x1743992d
-	int			fd;
-	void			*ptr;
-	double			idle;
-	VTAILQ_ENTRY(waited)	list;
-};
-
 /* Stored object -----------------------------------------------------
  * Pointer to a stored object, and the methods it supports
  */

bin/varnishd/cache/cache_backend_tcp.c

@@ -41,7 +41,6 @@
 #include "cache_backend.h"
 #include "vtcp.h"
 #include "vsa.h"
-#include "waiter/waiter.h"
 #include "vtim.h"
 
 struct tcp_pool {

bin/varnishd/cache/cache_panic.c

@@ -47,7 +47,6 @@
 #include "storage/storage.h"
 #include "vcl.h"
 #include "vcli_priv.h"
-#include "waiter/waiter.h"
 
 /*
  * The panic string is constructed in memory, then copied to the

bin/varnishd/cache/cache_session.c

@@ -47,7 +47,6 @@
 
 #include "cache.h"
 
-#include "waiter/waiter.h"
 #include "vsa.h"
 #include "vtcp.h"
 #include "vtim.h"

bin/varnishd/waiter/cache_waiter.c

@@ -36,7 +36,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 

bin/varnishd/waiter/cache_waiter_epoll.c

@@ -41,7 +41,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"

bin/varnishd/waiter/cache_waiter_kqueue.c

@@ -40,7 +40,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"

bin/varnishd/waiter/cache_waiter_poll.c

@@ -36,7 +36,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"

bin/varnishd/waiter/cache_waiter_ports.c

@@ -43,7 +43,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"

bin/varnishd/waiter/waiter.h

@@ -42,9 +42,21 @@
  * Public interfaces
  */
 
-struct waited;
 struct waiter;
 
+/* Connection waiter -------------------------------------------------
+ * Describing a file-descriptor/connection being waited on
+ */
+
+struct waited {
+	unsigned		magic;
+#define WAITED_MAGIC		0x1743992d
+	int			fd;
+	void			*ptr;
+	double			idle;
+	VTAILQ_ENTRY(waited)	list;
+};
+
 enum wait_event {
 	WAITER_REMCLOSE,
 	WAITER_TIMEOUT,