From 0b00ffe55f01958a048ded483eababd051247b8d Mon Sep 17 00:00:00 2001
From: David Goldblatt <davidgoldblatt@fb.com>
Date: Tue, 11 Apr 2017 12:57:18 -0700
Subject: [PATCH] Header refactoring: move bit_util.h out of the catchall

---
 include/jemalloc/internal/bitmap_inlines.h              | 2 ++
 include/jemalloc/internal/jemalloc_internal_includes.h  | 1 -
 include/jemalloc/internal/jemalloc_internal_inlines_a.h | 1 +
 include/jemalloc/internal/prng_inlines.h                | 1 +
 test/unit/bit_util.c                                    | 2 ++
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/jemalloc/internal/bitmap_inlines.h b/include/jemalloc/internal/bitmap_inlines.h
index 506d5269..fc4bad4c 100644
--- a/include/jemalloc/internal/bitmap_inlines.h
+++ b/include/jemalloc/internal/bitmap_inlines.h
@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_BITMAP_INLINES_H
 #define JEMALLOC_INTERNAL_BITMAP_INLINES_H
 
+#include "jemalloc/internal/bit_util.h"
+
 #ifndef JEMALLOC_ENABLE_INLINE
 bool bitmap_full(bitmap_t *bitmap, const bitmap_info_t *binfo);
 bool bitmap_get(bitmap_t *bitmap, const bitmap_info_t *binfo, size_t bit);
diff --git a/include/jemalloc/internal/jemalloc_internal_includes.h b/include/jemalloc/internal/jemalloc_internal_includes.h
index 6871883b..64cda53a 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/bit_util.h"
 #include "jemalloc/internal/malloc_io.h"
 #include "jemalloc/internal/util.h"
 
diff --git a/include/jemalloc/internal/jemalloc_internal_inlines_a.h b/include/jemalloc/internal/jemalloc_internal_inlines_a.h
index 600d7226..978814b4 100644
--- a/include/jemalloc/internal/jemalloc_internal_inlines_a.h
+++ b/include/jemalloc/internal/jemalloc_internal_inlines_a.h
@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_INLINES_A_H
 
 #include "jemalloc/internal/atomic.h"
+#include "jemalloc/internal/bit_util.h"
 
 #ifndef JEMALLOC_ENABLE_INLINE
 pszind_t psz2ind(size_t psz);
diff --git a/include/jemalloc/internal/prng_inlines.h b/include/jemalloc/internal/prng_inlines.h
index 7026d52a..c39c63f5 100644
--- a/include/jemalloc/internal/prng_inlines.h
+++ b/include/jemalloc/internal/prng_inlines.h
@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_PRNG_INLINES_H
 
 #include "jemalloc/internal/atomic.h"
+#include "jemalloc/internal/bit_util.h"
 
 #ifndef JEMALLOC_ENABLE_INLINE
 uint32_t	prng_state_next_u32(uint32_t state);
diff --git a/test/unit/bit_util.c b/test/unit/bit_util.c
index fe5c4473..42a97013 100644
--- a/test/unit/bit_util.c
+++ b/test/unit/bit_util.c
@@ -1,5 +1,7 @@
 #include "test/jemalloc_test.h"
 
+#include "jemalloc/internal/bit_util.h"
+
 #define TEST_POW2_CEIL(t, suf, pri) do {				\
 	unsigned i, pow2;						\
 	t x;								\