diff --git a/include/jemalloc/internal/peak_event.h b/include/jemalloc/internal/peak_event.h
index 0d1f1627..67e7a71b 100644
--- a/include/jemalloc/internal/peak_event.h
+++ b/include/jemalloc/internal/peak_event.h
@@ -2,6 +2,7 @@
 #define JEMALLOC_INTERNAL_PEAK_EVENT_H
 
 #include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/thread_event_registry.h"
 #include "jemalloc/internal/tsd_types.h"
 
 /*
diff --git a/src/ecache.c b/src/ecache.c
index 20fcee9e..e6620a8a 100644
--- a/src/ecache.c
+++ b/src/ecache.c
@@ -1,7 +1,9 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
-#include "jemalloc/internal/san.h"
+#include "jemalloc/internal/ecache.h"
+#include "jemalloc/internal/eset.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/witness.h"
 
 bool
 ecache_init(tsdn_t *tsdn, ecache_t *ecache, extent_state_t state, unsigned ind,
diff --git a/src/extent_mmap.c b/src/extent_mmap.c
index d39bddc6..10574618 100644
--- a/src/extent_mmap.c
+++ b/src/extent_mmap.c
@@ -1,8 +1,8 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/extent_mmap.h"
+#include "jemalloc/internal/pages.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/hpa_utils.c b/src/hpa_utils.c
index 59bb0d1f..02817d83 100644
--- a/src/hpa_utils.c
+++ b/src/hpa_utils.c
@@ -1,7 +1,7 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/hpa_utils.h"
+#include "jemalloc/internal/hpdata.h"
 
 void
 hpa_purge_batch(hpa_hooks_t *hooks, hpa_purge_item_t *batch, size_t batch_sz) {
diff --git a/src/inspect.c b/src/inspect.c
index 1c0de129..b2a961b2 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -1,5 +1,10 @@
 #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/bin_info.h"
+#include "jemalloc/internal/edata.h"
+#include "jemalloc/internal/emap.h"
 #include "jemalloc/internal/inspect.h"
 
 void
diff --git a/src/log.c b/src/log.c
index 9b1c6261..63054d83 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,4 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/log.h"
 
diff --git a/src/peak_event.c b/src/peak_event.c
index 39f90b70..f42cfc47 100644
--- a/src/peak_event.c
+++ b/src/peak_event.c
@@ -1,10 +1,10 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
-
-#include "jemalloc/internal/peak_event.h"
 
 #include "jemalloc/internal/peak.h"
+#include "jemalloc/internal/peak_event.h"
+#include "jemalloc/internal/thread_event.h"
 #include "jemalloc/internal/thread_event_registry.h"
+#include "jemalloc/internal/tsd.h"
 
 /* Update the peak with current tsd state. */
 void
diff --git a/src/prof_stats.c b/src/prof_stats.c
index db248be7..81d5e6f6 100644
--- a/src/prof_stats.c
+++ b/src/prof_stats.c
@@ -1,7 +1,9 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/prof.h"
 #include "jemalloc/internal/prof_stats.h"
+#include "jemalloc/internal/tsd.h"
 
 bool                opt_prof_stats = false;
 malloc_mutex_t      prof_stats_mtx;
diff --git a/src/safety_check.c b/src/safety_check.c
index d052718d..f11a263b 100644
--- a/src/safety_check.c
+++ b/src/safety_check.c
@@ -1,5 +1,7 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
+
+#include "jemalloc/internal/malloc_io.h"
+#include "jemalloc/internal/safety_check.h"
 
 static safety_check_abort_hook_t safety_check_abort;
 
diff --git a/src/util.c b/src/util.c
index 1bcf4fee..a23a5c8c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,6 +1,6 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
-#include "jemalloc/internal/jemalloc_internal_includes.h"
 
+#include "jemalloc/internal/malloc_io.h"
 #include "jemalloc/internal/util.h"
 
 /* Reads the next size pair in a multi-sized option. */