[master] 85bd7f3 Untangle nested includes

[Poul-Henning Kamp]

commit 85bd7f37488b5aa624ab8ab7cdd8e41d217818db
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 4 13:23:21 2015 +0000

    Untangle nested includes

diff --git a/bin/varnishd/cache/cache_vrt_re.c b/bin/varnishd/cache/cache_vrt_re.c
index 15b11a5..d96c4f4 100644
--- a/bin/varnishd/cache/cache_vrt_re.c
+++ b/bin/varnishd/cache/cache_vrt_re.c
@@ -35,7 +35,6 @@
 
 #include "cache.h"
 
-#include "vre.h"
 #include "vrt.h"
 
 static void
diff --git a/lib/libvarnishapi/generate.py b/lib/libvarnishapi/generate.py
index 82f7c59..28aa8ae 100755
--- a/lib/libvarnishapi/generate.py
+++ b/lib/libvarnishapi/generate.py
@@ -190,6 +190,9 @@ fo.write("""
 #include <ctype.h>
 #include <stdio.h>
 
+#include "vqueue.h"
+#include "vre.h"
+
 #include "vxp.h"
 """)
 
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 92f65ac..5e12f0f 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -49,7 +49,6 @@
 #include "vapi/vsl.h"
 #include "vbm.h"
 #include "vmb.h"
-#include "vre.h"
 #include "vsb.h"
 #include "vsl_api.h"
 #include "vsm_api.h"
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index 4a9b897..a37a8ce 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -51,7 +51,6 @@
 #include "vapi/vsm.h"
 #include "vbm.h"
 #include "vnum.h"
-#include "vre.h"
 #include "vsl_api.h"
 #include "vsm_api.h"
 
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 71c8aa4..7b4d279 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -41,7 +41,6 @@
 #include "vdef.h"
 #include "vbm.h"
 #include "vnum.h"
-#include "vre.h"
 #include "vsb.h"
 
 #include "vapi/vsl.h"
diff --git a/lib/libvarnishapi/vxp.c b/lib/libvarnishapi/vxp.c
index bac2c3d..e877cae 100644
--- a/lib/libvarnishapi/vxp.c
+++ b/lib/libvarnishapi/vxp.c
@@ -39,6 +39,8 @@
 #include "vas.h"
 #include "vdef.h"
 #include "miniobj.h"
+#include "vqueue.h"
+#include "vre.h"
 #include "vsb.h"
 
 #include "vxp.h"
diff --git a/lib/libvarnishapi/vxp.h b/lib/libvarnishapi/vxp.h
index eb21031..0589775 100644
--- a/lib/libvarnishapi/vxp.h
+++ b/lib/libvarnishapi/vxp.h
@@ -28,11 +28,6 @@
  *
  */
 
-#include <sys/types.h>
-
-#include "vqueue.h"
-#include "vre.h"
-
 #include "vxp_tokens.h"
 
 #define isword(c)  (isalpha(c) || isdigit(c) || (c) == '_' || (c) == '-' || \
diff --git a/lib/libvarnishapi/vxp_lexer.c b/lib/libvarnishapi/vxp_lexer.c
index 8f6ef99..59e6869 100644
--- a/lib/libvarnishapi/vxp_lexer.c
+++ b/lib/libvarnishapi/vxp_lexer.c
@@ -39,6 +39,8 @@
 #include "vdef.h"
 #include "vsb.h"
 #include "vas.h"
+#include "vqueue.h"
+#include "vre.h"
 
 #include "vxp.h"