Untangle nested includes

bin/varnishd/cache/cache_vrt_re.c

@@ -35,7 +35,6 @@
 
 #include "cache.h"
 
-#include "vre.h"
 #include "vrt.h"
 
 static void

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"
 """)
 

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"

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"
 

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"

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"

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) == '-' || \

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"