Header refactoring: size_classes module - remove from the catchall

include/jemalloc/internal/arena_externs.h

@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_ARENA_EXTERNS_H
 #define JEMALLOC_INTERNAL_ARENA_EXTERNS_H
 
+#include "jemalloc/internal/size_classes.h"
+
 static const size_t	large_pad =
 #ifdef JEMALLOC_CACHE_OBLIVIOUS
     PAGE

include/jemalloc/internal/arena_inlines_b.h

@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_ARENA_INLINES_B_H
 
 #include "jemalloc/internal/jemalloc_internal_types.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/ticker.h"
 
 static inline szind_t

include/jemalloc/internal/arena_structs_b.h

@@ -2,8 +2,10 @@
 #define JEMALLOC_INTERNAL_ARENA_STRUCTS_B_H
 
 #include "jemalloc/internal/atomic.h"
+#include "jemalloc/internal/jemalloc_internal_types.h"
 #include "jemalloc/internal/nstime.h"
 #include "jemalloc/internal/ql.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/ticker.h"
 
 /*

include/jemalloc/internal/base_structs.h

@@ -1,6 +1,9 @@
 #ifndef JEMALLOC_INTERNAL_BASE_STRUCTS_H
 #define JEMALLOC_INTERNAL_BASE_STRUCTS_H
 
+#include "jemalloc/internal/jemalloc_internal_types.h"
+#include "jemalloc/internal/size_classes.h"
+
 /* Embedded at the beginning of every block of base-managed virtual memory. */
 struct base_block_s {
 	/* Total size of block's virtual memory mapping. */

include/jemalloc/internal/bitmap_types.h

@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_BITMAP_TYPES_H
 #define JEMALLOC_INTERNAL_BITMAP_TYPES_H
 
+#include "jemalloc/internal/size_classes.h"
+
 /* Maximum bitmap bit count is 2^LG_BITMAP_MAXBITS. */
 #if LG_SLAB_MAXREGS > LG_CEIL_NSIZES
 /* Maximum bitmap bit count is determined by maximum regions per slab. */

include/jemalloc/internal/ctl_structs.h

@@ -1,7 +1,9 @@
 #ifndef JEMALLOC_INTERNAL_CTL_STRUCTS_H
 #define JEMALLOC_INTERNAL_CTL_STRUCTS_H
 
+#include "jemalloc/internal/jemalloc_internal_types.h"
 #include "jemalloc/internal/ql.h"
+#include "jemalloc/internal/size_classes.h"
 
 struct ctl_node_s {
 	bool			named;

include/jemalloc/internal/extent_structs.h

@@ -5,6 +5,7 @@
 #include "jemalloc/internal/ql.h"
 #include "jemalloc/internal/rb.h"
 #include "jemalloc/internal/ph.h"
+#include "jemalloc/internal/size_classes.h"
 
 typedef enum {
 	extent_state_active   = 0,

include/jemalloc/internal/jemalloc_internal_includes.h

@@ -40,7 +40,6 @@
 /* TYPES */
 /******************************************************************************/
 
-#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/smoothstep.h"
 #include "jemalloc/internal/stats_types.h"
 #include "jemalloc/internal/ctl_types.h"

include/jemalloc/internal/jemalloc_internal_inlines_a.h

@@ -4,6 +4,7 @@
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/bit_util.h"
 #include "jemalloc/internal/jemalloc_internal_types.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/ticker.h"
 
 JEMALLOC_ALWAYS_INLINE pszind_t

include/jemalloc/internal/rtree_inlines.h

@@ -1,6 +1,7 @@
 #ifndef JEMALLOC_INTERNAL_RTREE_INLINES_H
 #define JEMALLOC_INTERNAL_RTREE_INLINES_H
 
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/spin.h"
 
 JEMALLOC_ALWAYS_INLINE uintptr_t

include/jemalloc/internal/rtree_types.h

@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_RTREE_TYPES_H
 #define JEMALLOC_INTERNAL_RTREE_TYPES_H
 
+#include "jemalloc/internal/size_classes.h"
+
 /*
  * This radix tree implementation is tailored to the singular purpose of
  * associating metadata with extents that are currently owned by jemalloc.

include/jemalloc/internal/stats_structs.h

@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_STATS_STRUCTS_H
 
 #include "jemalloc/internal/atomic.h"
+#include "jemalloc/internal/size_classes.h"
 
 #ifdef JEMALLOC_ATOMIC_U64
 typedef atomic_u64_t arena_stats_u64_t;

include/jemalloc/internal/tcache_externs.h

@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_TCACHE_EXTERNS_H
 #define JEMALLOC_INTERNAL_TCACHE_EXTERNS_H
 
+#include "jemalloc/internal/size_classes.h"
+
 extern bool	opt_tcache;
 extern ssize_t	opt_lg_tcache_max;
 

include/jemalloc/internal/tcache_inlines.h

@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_TCACHE_INLINES_H
 
 #include "jemalloc/internal/jemalloc_internal_types.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/ticker.h"
 #include "jemalloc/internal/util.h"
 

include/jemalloc/internal/tcache_structs.h

@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_TCACHE_STRUCTS_H
 
 #include "jemalloc/internal/ql.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/ticker.h"
 
 /*

include/jemalloc/internal/tcache_types.h

@@ -1,6 +1,8 @@
 #ifndef JEMALLOC_INTERNAL_TCACHE_TYPES_H
 #define JEMALLOC_INTERNAL_TCACHE_TYPES_H
 
+#include "jemalloc/internal/size_classes.h"
+
 typedef struct tcache_bin_info_s tcache_bin_info_t;
 typedef struct tcache_bin_s tcache_bin_t;
 typedef struct tcache_s tcache_t;

src/arena.c

@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/util.h"
 
 /******************************************************************************/

src/ctl.c

@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/nstime.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/util.h"
 
 /******************************************************************************/

src/jemalloc.c

@@ -6,6 +6,7 @@
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/jemalloc_internal_types.h"
 #include "jemalloc/internal/malloc_io.h"
+#include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/spin.h"
 #include "jemalloc/internal/ticker.h"
 #include "jemalloc/internal/util.h"

src/tcache.c

@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/size_classes.h"
 
 /******************************************************************************/
 /* Data. */