Always include vdef.h first - directly or via varnishevent.h

src/config.c

@@ -42,7 +42,6 @@
 
 #include "config.h"
 
-#include "vdef.h"
 #include "varnishevent.h"
 
 #include "vas.h"

src/data.c

@@ -37,7 +37,6 @@
 #include <ctype.h>
 #include <stddef.h>
 
-#include "vdef.h"
 #include "varnishevent.h"
 #include "data.h"
 #include "hdrtrie.h"

src/format.c

@@ -37,14 +37,14 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include "vdef.h"
+#include "varnishevent.h"
+
 #include "vapi/vsl.h"
 #include "vas.h"
 #include "miniobj.h"
 #include "base64.h"
 #include "vqueue.h"
 
-#include "varnishevent.h"
 #include "format.h"
 #include "hdrtrie.h"
 #include "strfTIM.h"

src/handler.c

@@ -48,12 +48,11 @@
 #include <execinfo.h>
 #endif
 
+#include "varnishevent.h"
+
 #include "vas.h"
-#include "vdef.h"
 #include "vsb.h"
 
-#include "varnishevent.h"
-
 /* XXX: configurable? */
 #define MAX_STACK_DEPTH 100
 

src/log.c

@@ -37,7 +37,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "vdef.h"
 #include "varnishevent.h"
 
 static const char *level2name[LOG_DEBUG+1];

src/monitor.c

@@ -35,7 +35,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include "vdef.h"
 #include "varnishevent.h"
 #include "vtim.h"
 

src/spscq.c

@@ -33,7 +33,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include "vdef.h"
 #include "varnishevent.h"
 #include "vqueue.h"
 #include "vas.h"

src/strfTIM.c

@@ -37,6 +37,7 @@
 
 #include "strfTIM.h"
 
+#include "vdef.h"
 #include "vas.h"
 
 /*

src/varnishevent.c

@@ -59,15 +59,14 @@
 #include <stdint.h>
 #include <errno.h>
 
+#include "varnishevent.h"
 #include "vqueue.h"
 #include "vapi/vsm.h"
 #include "vapi/vsl.h"
 #include "miniobj.h"
 #include "vas.h"
-#include "vdef.h"
 #include "vsb.h"
 
-#include "varnishevent.h"
 #include "vtim.h"
 #include "vpf.h"
 #include "vcs_version.h"

src/varnishevent.h

@@ -42,6 +42,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "vdef.h"
+
 #include "hdrtrie.h"
 
 #include "vapi/vsl.h"

src/vmb.c

@@ -32,6 +32,7 @@
 #include <pthread.h>
 #include <unistd.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "vmb.h"
 

src/vpf.c

@@ -41,6 +41,7 @@
 #include <unistd.h>
 
 #include "flopen.h"
+#include "vdef.h"
 #include "vas.h"
 #include "vpf.h"
 

src/vtim.c

@@ -56,6 +56,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "vtim.h"
 

src/writer.c

@@ -40,7 +40,6 @@
 #include <poll.h>
 #include <errno.h>
 
-#include "vdef.h"
 #include "varnishevent.h"
 #include "writer.h"