diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index d73e45db7e..68a8f338d1 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -44,6 +44,7 @@
 #include "vapi/vsl.h"
 #include "vapi/voptget.h"
 #include "vas.h"
+#include "vdef.h"
 #include "vpf.h"
 #include "vsb.h"
 #include "vut.h"
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index ce425ebbdf..4549539477 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -57,6 +57,7 @@
 #include "vapi/vsl.h"
 #include "vapi/voptget.h"
 #include "vas.h"
+#include "vdef.h"
 #include "vcs.h"
 #include "vnum.h"
 #include "vsb.h"
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 15835cb64d..f9aaf47a32 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -49,6 +49,7 @@
 #include "vapi/vsl.h"
 #include "vapi/voptget.h"
 #include "vas.h"
+#include "vdef.h"
 #include "vcs.h"
 #include "vtree.h"
 #include "vsb.h"
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index 375a678de2..133284470a 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: head/sys/kern/subr_vsb.c 222004 2011-05-17 06:36:32Z phk $")
 #include <stdlib.h>
 #include <string.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "vsb.h"
 
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index a271561e6a..71c8aa41bc 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -38,6 +38,7 @@
 
 #include "miniobj.h"
 #include "vas.h"
+#include "vdef.h"
 #include "vbm.h"
 #include "vnum.h"
 #include "vre.h"
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 2e4532e0e0..ebc742e22a 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -45,6 +45,7 @@
 
 #include "miniobj.h"
 #include "vas.h"
+#include "vdef.h"
 
 #include "vapi/vsm.h"
 #include "vsm_priv.h"
diff --git a/lib/libvarnishapi/vxp.c b/lib/libvarnishapi/vxp.c
index c16de979ff..bac2c3d6aa 100644
--- a/lib/libvarnishapi/vxp.c
+++ b/lib/libvarnishapi/vxp.c
@@ -36,9 +36,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include "vsb.h"
 #include "vas.h"
+#include "vdef.h"
 #include "miniobj.h"
+#include "vsb.h"
 
 #include "vxp.h"
 
diff --git a/lib/libvarnishapi/vxp_lexer.c b/lib/libvarnishapi/vxp_lexer.c
index cb2bff9b6d..8f6ef9983a 100644
--- a/lib/libvarnishapi/vxp_lexer.c
+++ b/lib/libvarnishapi/vxp_lexer.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "vdef.h"
 #include "vsb.h"
 #include "vas.h"
 
diff --git a/lib/libvarnishapi/vxp_parse.c b/lib/libvarnishapi/vxp_parse.c
index 13472a205c..8e9632de3a 100644
--- a/lib/libvarnishapi/vxp_parse.c
+++ b/lib/libvarnishapi/vxp_parse.c
@@ -40,6 +40,7 @@
 
 #include "miniobj.h"
 #include "vas.h"
+#include "vdef.h"
 #include "vbm.h"
 #include "vnum.h"
 #include "vsb.h"