diff --git a/src/ckh.c b/src/ckh.c
index 80688162..1bfcdf2f 100644
--- a/src/ckh.c
+++ b/src/ckh.c
@@ -38,10 +38,11 @@
 
 #include "jemalloc/internal/ckh.h"
 
-#include "jemalloc/internal/jemalloc_internal_includes.h"
-
+#include "jemalloc/internal/arena.h"
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_a.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_c.h"
 #include "jemalloc/internal/malloc_io.h"
 #include "jemalloc/internal/prng.h"
 #include "jemalloc/internal/util.h"
diff --git a/src/emap.c b/src/emap.c
index c9a371d2..c6936f8a 100644
--- a/src/emap.c
+++ b/src/emap.c
@@ -1,7 +1,7 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/emap.h"
+#include "jemalloc/internal/extent.h"
 
 enum emap_lock_result_e {
 	emap_lock_result_success,
diff --git a/src/eset.c b/src/eset.c
index bdce1834..4d1f8f04 100644
--- a/src/eset.c
+++ b/src/eset.c
@@ -1,5 +1,4 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/eset.h"
 
diff --git a/src/hpdata.c b/src/hpdata.c
index a538a422..1da4ffa0 100644
--- a/src/hpdata.c
+++ b/src/hpdata.c
@@ -1,5 +1,4 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/hpdata.h"
 
diff --git a/src/prof_recent.c b/src/prof_recent.c
index f7108bee..dbc0fe4a 100644
--- a/src/prof_recent.c
+++ b/src/prof_recent.c
@@ -1,10 +1,15 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/arena_inlines_b.h"
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/buf_writer.h"
 #include "jemalloc/internal/emitter.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_a.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_c.h"
+#include "jemalloc/internal/prof.h"
 #include "jemalloc/internal/prof_data.h"
+#include "jemalloc/internal/prof_inlines.h"
 #include "jemalloc/internal/prof_recent.h"
 
 ssize_t            opt_prof_recent_alloc_max = PROF_RECENT_ALLOC_MAX_DEFAULT;
diff --git a/src/psset.c b/src/psset.c
index 4c6ab255..b9b739ad 100644
--- a/src/psset.c
+++ b/src/psset.c
@@ -1,9 +1,8 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
-
-#include "jemalloc/internal/psset.h"
 
 #include "jemalloc/internal/fb.h"
+#include "jemalloc/internal/psset.h"
+#include "jemalloc/internal/sz.h"
 
 void
 psset_init(psset_t *psset) {
diff --git a/src/sec.c b/src/sec.c
index 493e4629..879fc47e 100644
--- a/src/sec.c
+++ b/src/sec.c
@@ -1,8 +1,8 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
-#include "jemalloc/internal/sec.h"
 #include "jemalloc/internal/jemalloc_probe.h"
+#include "jemalloc/internal/sec.h"
+#include "jemalloc/internal/witness.h"
 
 static bool
 sec_bin_init(sec_bin_t *bin) {
diff --git a/src/thread_event.c b/src/thread_event.c
index a8c5e2e1..2f2dd711 100644
--- a/src/thread_event.c
+++ b/src/thread_event.c
@@ -1,9 +1,12 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/jemalloc_internal_inlines_a.h"
+#include "jemalloc/internal/peak_event.h"
+#include "jemalloc/internal/prof.h"
+#include "jemalloc/internal/tcache.h"
 #include "jemalloc/internal/thread_event.h"
 #include "jemalloc/internal/thread_event_registry.h"
-#include "jemalloc/internal/peak_event.h"
+#include "jemalloc/internal/tsd.h"
 
 static bool
 te_ctx_has_active_events(te_ctx_t *ctx) {
diff --git a/src/tsd.c b/src/tsd.c
index 67200f50..b639aac5 100644
--- a/src/tsd.c
+++ b/src/tsd.c
@@ -1,10 +1,22 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/arena_inlines_a.h"
+#include "jemalloc/internal/arenas_management.h"
 #include "jemalloc/internal/assert.h"
-#include "jemalloc/internal/san.h"
+#include "jemalloc/internal/background_thread.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_a.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_b.h"
+#include "jemalloc/internal/malloc_io.h"
 #include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/prof.h"
 #include "jemalloc/internal/rtree.h"
+#include "jemalloc/internal/san.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/thread_event.h"
+#include "jemalloc/internal/tsd.h"
+#include "jemalloc/internal/witness.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/zone.c b/src/zone.c
index 62d2eabb..62957f17 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -1,8 +1,12 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/arenas_management.h"
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/jemalloc_fork.h"
+#include "jemalloc/internal/jemalloc_init.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_a.h"
+#include "jemalloc/internal/jemalloc_internal_inlines_c.h"
 
 #ifndef JEMALLOC_ZONE
 #	error "This source file is for zones on Darwin (OS X)."