diff --git a/include/jemalloc/internal/jemalloc_internal_includes.h b/include/jemalloc/internal/jemalloc_internal_includes.h
index d4d0c201..3a9c6ca2 100644
--- a/include/jemalloc/internal/jemalloc_internal_includes.h
+++ b/include/jemalloc/internal/jemalloc_internal_includes.h
@@ -41,7 +41,6 @@
 /******************************************************************************/
 
 #include "jemalloc/internal/assert.h"
-#include "jemalloc/internal/util.h"
 
 /******************************************************************************/
 /* TYPES */
diff --git a/include/jemalloc/internal/tcache_inlines.h b/include/jemalloc/internal/tcache_inlines.h
index ea29f350..77e559a7 100644
--- a/include/jemalloc/internal/tcache_inlines.h
+++ b/include/jemalloc/internal/tcache_inlines.h
@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_TCACHE_INLINES_H
 #define JEMALLOC_INTERNAL_TCACHE_INLINES_H
 
+#include "jemalloc/internal/util.h"
+
 #ifndef JEMALLOC_ENABLE_INLINE
 void	tcache_event(tsd_t *tsd, tcache_t *tcache);
 void	tcache_flush(void);
diff --git a/src/arena.c b/src/arena.c
index 74511405..27a0f75c 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -2,6 +2,8 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/util.h"
+
 /******************************************************************************/
 /* Data. */
 
diff --git a/src/ckh.c b/src/ckh.c
index a9d181bd..ce977e14 100644
--- a/src/ckh.c
+++ b/src/ckh.c
@@ -39,6 +39,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/malloc_io.h"
+#include "jemalloc/internal/util.h"
 
 /******************************************************************************/
 /* Function prototypes for non-inline static functions. */
diff --git a/src/ctl.c b/src/ctl.c
index 7a1b03f1..29689c8e 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -2,6 +2,8 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/util.h"
+
 /******************************************************************************/
 /* Data. */
 
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 4b4e9430..7e3ec6ea 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/malloc_io.h"
+#include "jemalloc/internal/util.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/large.c b/src/large.c
index 3b53eb33..aa3ea1ff 100644
--- a/src/large.c
+++ b/src/large.c
@@ -2,6 +2,8 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/util.h"
+
 /******************************************************************************/
 
 void *
diff --git a/src/malloc_io.c b/src/malloc_io.c
index 11dc68db..6b99afcd 100644
--- a/src/malloc_io.c
+++ b/src/malloc_io.c
@@ -1,7 +1,9 @@
 #define JEMALLOC_MALLOC_IO_C_
 #include "jemalloc/internal/jemalloc_preamble.h"
 #include "jemalloc/internal/jemalloc_internal_includes.h"
+
 #include "jemalloc/internal/malloc_io.h"
+#include "jemalloc/internal/util.h"
 
 #ifdef assert
 #  undef assert
diff --git a/test/unit/junk.c b/test/unit/junk.c
index cfa8d0f2..f9390e41 100644
--- a/test/unit/junk.c
+++ b/test/unit/junk.c
@@ -1,5 +1,7 @@
 #include "test/jemalloc_test.h"
 
+#include "jemalloc/internal/util.h"
+
 static arena_dalloc_junk_small_t *arena_dalloc_junk_small_orig;
 static large_dalloc_junk_t *large_dalloc_junk_orig;
 static large_dalloc_maybe_junk_t *large_dalloc_maybe_junk_orig;
diff --git a/test/unit/mallctl.c b/test/unit/mallctl.c
index 4241063e..b8c6a255 100644
--- a/test/unit/mallctl.c
+++ b/test/unit/mallctl.c
@@ -1,5 +1,7 @@
 #include "test/jemalloc_test.h"
 
+#include "jemalloc/internal/util.h"
+
 TEST_BEGIN(test_mallctl_errors) {
 	uint64_t epoch;
 	size_t sz;
diff --git a/test/unit/stats_print.c b/test/unit/stats_print.c
index 81778b04..acb26b06 100644
--- a/test/unit/stats_print.c
+++ b/test/unit/stats_print.c
@@ -1,5 +1,7 @@
 #include "test/jemalloc_test.h"
 
+#include "jemalloc/internal/util.h"
+
 typedef enum {
 	TOKEN_TYPE_NONE,
 	TOKEN_TYPE_ERROR,