[master] 81bc4ce Make sure we always see vdef.h before vrt.h

[Poul-Henning Kamp]

commit 81bc4cef2a5e651a9e34ae5400672a88663db7ef
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 7 09:44:30 2017 +0000

    Make sure we always see vdef.h before vrt.h

diff --git a/lib/libvarnish/vsa.c b/lib/libvarnish/vsa.c
index 299deb7..3909e81 100644
--- a/lib/libvarnish/vsa.c
+++ b/lib/libvarnish/vsa.c
@@ -38,10 +38,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "vsa.h"
 #include "vrt.h"
-#include "vdef.h"
 #include "miniobj.h"
 
 /*
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index a6db988..a9e09ae 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -785,7 +785,7 @@ class vcc(object):
 
 		fn2 = fn + ".tmp2"
 
-		for i in ["config", "vcl", "vrt", self.pfx, "vmod_abi"]:
+		for i in ["config", "vdef", "vcl", "vrt", self.pfx, "vmod_abi"]:
 			fo.write('#include "%s.h"\n' % i)
 
 		fo.write("\n")
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index b2d87f6..eecfb7f 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -31,10 +31,11 @@
 #include <netdb.h>
 #include <stdlib.h>
 
+#include "cache/cache.h"
+
 #include "vcl.h"
 #include "vrt.h"
 
-#include "cache/cache.h"
 #include "cache/cache_director.h"
 #include "cache/cache_backend.h"
 
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 5b458d3..94baed2 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -34,13 +34,14 @@
 #include <stdlib.h>
 #include <syslog.h>
 
+#include "cache/cache.h"
+
 #include "vrnd.h"
 #include "vrt.h"
 #include "vtcp.h"
 #include "vsa.h"
 #include "vtim.h"
 
-#include "cache/cache.h"
 #include "cache/cache_director.h"
 
 #include "vcc_if.h"
diff --git a/lib/libvmod_std/vmod_std_querysort.c b/lib/libvmod_std/vmod_std_querysort.c
index 6f6a90b..024b42d 100644
--- a/lib/libvmod_std/vmod_std_querysort.c
+++ b/lib/libvmod_std/vmod_std_querysort.c
@@ -30,10 +30,10 @@
 
 #include <stdlib.h>
 
-#include "vrt.h"
-
 #include "cache/cache.h"
 
+#include "vrt.h"
+
 #include "vcc_if.h"
 
 static int