Header refactoring: move util.h out of the catchall

include/jemalloc/internal/jemalloc_internal_includes.h

@@ -41,7 +41,6 @@
 /******************************************************************************/
 
 #include "jemalloc/internal/assert.h"
-#include "jemalloc/internal/util.h"
 
 /******************************************************************************/
 /* TYPES */

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);

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. */
 

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. */

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. */
 

src/jemalloc.c

@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/malloc_io.h"
+#include "jemalloc/internal/util.h"
 
 /******************************************************************************/
 /* Data. */

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 *

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

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;

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;

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,