From 22c3dc450c85556c65c2a0c7b39b051215e29f95 Mon Sep 17 00:00:00 2001
From: Slobodan Predolac <spredolac@meta.com>
Date: Wed, 27 May 2026 18:44:56 -0400
Subject: [PATCH] Drop umbrella include from 5 small .c files (batch 1)

Replaces #include "jemalloc_internal_includes.h" with explicit
per-symbol includes in five small TUs:

  src/edata.c       -> edata.h
  src/exp_grow.c    -> exp_grow.h
  src/ticker.c      -> ticker.h
  src/bin_info.c    -> assert.h, bin_info.h
  src/counter.c     -> counter.h, witness.h

One latent hermeticity bug surfaced: sz.h's
sz_large_size_classes_disabled() inline references
opt_disable_large_size_classes (declared in
jemalloc_internal_externs.h) but sz.h didn't include that header.
Worked under the umbrella but breaks once consumers stop including
everything.  Added the include to sz.h so it stands on its own.

Step 6 (Option B) of the cyclical-dep cleanup, batch 1 of N.
---
 include/jemalloc/internal/sz.h | 1 +
 src/bin_info.c                 | 2 +-
 src/counter.c                  | 2 +-
 src/edata.c                    | 3 ++-
 src/exp_grow.c                 | 3 ++-
 src/ticker.c                   | 3 ++-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/jemalloc/internal/sz.h b/include/jemalloc/internal/sz.h
index 3ee8a6b3..0e7b029e 100644
--- a/include/jemalloc/internal/sz.h
+++ b/include/jemalloc/internal/sz.h
@@ -3,6 +3,7 @@
 
 #include "jemalloc/internal/jemalloc_preamble.h"
 #include "jemalloc/internal/bit_util.h"
+#include "jemalloc/internal/jemalloc_internal_externs.h"
 #include "jemalloc/internal/pages.h"
 #include "jemalloc/internal/sc.h"
 #include "jemalloc/internal/util.h"
diff --git a/src/bin_info.c b/src/bin_info.c
index e10042fd..0b8e551a 100644
--- a/src/bin_info.c
+++ b/src/bin_info.c
@@ -1,6 +1,6 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/bin_info.h"
 
 bin_info_t bin_infos[SC_NBINS];
diff --git a/src/counter.c b/src/counter.c
index 8257a062..243c41ba 100644
--- a/src/counter.c
+++ b/src/counter.c
@@ -1,7 +1,7 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/counter.h"
+#include "jemalloc/internal/witness.h"
 
 bool
 counter_accum_init(counter_accum_t *counter, uint64_t interval) {
diff --git a/src/edata.c b/src/edata.c
index d71d1679..575e4c86 100644
--- a/src/edata.c
+++ b/src/edata.c
@@ -1,5 +1,6 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
+
+#include "jemalloc/internal/edata.h"
 
 ph_gen(, edata_avail, edata_t, avail_link, edata_esnead_comp)
     ph_gen(, edata_heap, edata_t, heap_link, edata_snad_comp)
diff --git a/src/exp_grow.c b/src/exp_grow.c
index 955823a1..17699561 100644
--- a/src/exp_grow.c
+++ b/src/exp_grow.c
@@ -1,5 +1,6 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
+
+#include "jemalloc/internal/exp_grow.h"
 
 void
 exp_grow_init(exp_grow_t *exp_grow) {
diff --git a/src/ticker.c b/src/ticker.c
index 1fd6ac96..b3cac9d1 100644
--- a/src/ticker.c
+++ b/src/ticker.c
@@ -1,5 +1,6 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
+
+#include "jemalloc/internal/ticker.h"
 
 /*
  * To avoid using floating point math down core paths (still necessary because