[master] 3c3c6ab Untangle more nested includes

[Poul-Henning Kamp]

commit 3c3c6ab60c0067a06bde1783563e6821e9650a67
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 4 13:47:46 2015 +0000

    Untangle more nested includes

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index c364ad3..310eccc 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -46,6 +46,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vdef.h"
 #include "vcurses.h"
 #include "vapi/vsl.h"
 #include "vapi/vsm.h"
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index d8fc721..8002f95 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -82,7 +82,7 @@ SLTM(SessOpen, 0, "Client connection opened",
  * XXX: If we could, these three lines would have described the
  * XXX: 'reason' field below.
 #define SESS_CLOSE(nm, desc) "    " #nm "\n\t" desc "\n\n"
-#include <tbl/sess_close.h>
+#include "tbl/sess_close.h"
 #undef SESS_CLOSE
 */
 
diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h
index 8d5a2ef..c202dfd 100644
--- a/include/vapi/vsl.h
+++ b/include/vapi/vsl.h
@@ -34,8 +34,6 @@
 #ifndef VAPI_VSL_H_INCLUDED
 #define VAPI_VSL_H_INCLUDED
 
-#include <stdio.h>
-
 #include "vapi/vsl_int.h"
 
 struct VSM_data;
diff --git a/include/vcli_common.h b/include/vcli_common.h
index fbb4e9f..8d0a623 100644
--- a/include/vcli_common.h
+++ b/include/vcli_common.h
@@ -28,8 +28,6 @@
  *
  */
 
-#include "vdef.h"
-
 struct vlu;
 struct VCLS;
 
diff --git a/include/vut.h b/include/vut.h
index bd093d1..6558227 100644
--- a/include/vut.h
+++ b/include/vut.h
@@ -29,8 +29,6 @@
  * Common functions for the utilities
  */
 
-#include "vdef.h"
-
 typedef int VUT_cb_f(void);
 
 struct VUT {
diff --git a/lib/libvarnish/cli_common.c b/lib/libvarnish/cli_common.c
index 74c966f..44a6869 100644
--- a/lib/libvarnish/cli_common.c
+++ b/lib/libvarnish/cli_common.c
@@ -43,8 +43,10 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "miniobj.h"
+#include "vdef.h"
 #include "vas.h"
+#include "miniobj.h"
+
 #include "vcli.h"
 #include "vcli_common.h"
 #include "vcli_priv.h"
diff --git a/lib/libvarnish/cli_serve.c b/lib/libvarnish/cli_serve.c
index 7b7d9d5..64fb7dd 100644
--- a/lib/libvarnish/cli_serve.c
+++ b/lib/libvarnish/cli_serve.c
@@ -41,8 +41,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "miniobj.h"
+#include "vdef.h"
 #include "vas.h"
+#include "miniobj.h"
 
 #include "vav.h"
 #include "vcli.h"
diff --git a/lib/libvarnishapi/vsl_dispatch.c b/lib/libvarnishapi/vsl_dispatch.c
index 5189081..0b9285c 100644
--- a/lib/libvarnishapi/vsl_dispatch.c
+++ b/lib/libvarnishapi/vsl_dispatch.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 435a351..20ef8c2 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <math.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/lib/libvarnishtools/vut.c b/lib/libvarnishtools/vut.c
index 1635ffe..6c4a683 100644
--- a/lib/libvarnishtools/vut.c
+++ b/lib/libvarnishtools/vut.c
@@ -41,6 +41,7 @@
 #include <signal.h>
 
 #include "compat/daemon.h"
+#include "vdef.h"
 #include "vpf.h"
 #include "vapi/vsm.h"
 #include "vapi/vsl.h"