diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 5ed30c4..037d77b 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -241,7 +241,7 @@ struct http_conn {
 /*--------------------------------------------------------------------*/
 
 struct acct {
-#define ACCT(foo)	uint64_t	foo;
+#define ACCT(foo)	uintmax_t	foo;
 #include "tbl/acct_fields.h"
 #undef ACCT
 };
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 543b0e3..1eede05 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -49,7 +49,7 @@
 static int
 do_xml_cb(void *priv, const struct VSC_point * const pt)
 {
-	uint64_t val;
+	uintmax_t val;
 	const struct VSC_section *sec;
 
 	(void)priv;
@@ -92,7 +92,7 @@ do_xml(struct VSM_data *vd)
 static int
 do_json_cb(void *priv, const struct VSC_point * const pt)
 {
-	uint64_t val;
+	uintmax_t val;
 	int *jp;
 	const struct VSC_section *sec;
 
@@ -160,7 +160,7 @@ static int
 do_once_cb(void *priv, const struct VSC_point * const pt)
 {
 	struct once_priv *op;
-	uint64_t val;
+	uintmax_t val;
 	int i;
 	const struct VSC_section *sec;
 
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index a958fb0..c1e8275 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -752,7 +752,7 @@ do_stat_cb(void *priv, const struct VSC_point * const pt)
 
 static void
 varnish_expect(const struct varnish *v, char * const *av) {
-	uint64_t ref;
+	uintmax_t ref;
 	int good;
 	char *p;
 	int i;