14 files changed, 18 insertions, 3 deletions
diff --git a/Python/ast_opt.c b/Python/ast_opt.c
index 12414453c48..e261f04361b 100644
--- a/Python/ast_opt.c
+++ b/Python/ast_opt.c
@@ -4,6 +4,7 @@
 #include "pycore_format.h"        // F_LJUST
 #include "pycore_runtime.h"       // _Py_STR()
 #include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString()
+#include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString()
 
 
 typedef struct {
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index c5455bef59a..9f14d174557 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -5,6 +5,7 @@
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_ceval.h"         // _PyEval_Vector()
 #include "pycore_compile.h"       // _PyAST_Compile()
+#include "pycore_fileutils.h"     // _PyFile_Flush
 #include "pycore_long.h"          // _PyLong_CompactValue
 #include "pycore_modsupport.h"    // _PyArg_NoKwnames()
 #include "pycore_object.h"        // _Py_AddToAllObjects()
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 7af4d642edb..66546080b1f 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -29,6 +29,7 @@
 #include "pycore_long.h"          // _PyLong_ExactDealloc()
 #include "pycore_setobject.h"     // _PySet_NextEntry()
 #include "pycore_sliceobject.h"   // _PyBuildSlice_ConsumeRefs
+#include "pycore_stackref.h"
 #include "pycore_tuple.h"         // _PyTuple_ITEMS()
 #include "pycore_typeobject.h"    // _PySuper_Lookup()
 
diff --git a/Python/codegen.c b/Python/codegen.c
index a0494170330..e1f647451f7 100644
--- a/Python/codegen.c
+++ b/Python/codegen.c
@@ -19,6 +19,7 @@
 #include "pycore_opcode_utils.h"
 #undef NEED_OPCODE_TABLES
 #include "pycore_c_array.h"       // _Py_c_array_t
+#include "pycore_code.h"          // COMPARISON_LESS_THAN
 #include "pycore_compile.h"
 #include "pycore_instruction_sequence.h" // _PyInstructionSequence_NewLabel()
 #include "pycore_intrinsics.h"
@@ -26,6 +27,7 @@
 #include "pycore_object.h"        // _Py_ANNOTATE_FORMAT_VALUE_WITH_FAKE_GLOBALS
 #include "pycore_pystate.h"       // _Py_GetConfig()
 #include "pycore_symtable.h"      // PySTEntryObject
+#include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString
 
 #define NEED_OPCODE_METADATA
 #include "pycore_opcode_metadata.h" // _PyOpcode_opcode_metadata, _PyOpcode_num_popped/pushed
diff --git a/Python/compile.c b/Python/compile.c
index a52183ef515..f5e2973436b 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -16,12 +16,13 @@
 
 #include "Python.h"
 #include "pycore_ast.h"           // PyAST_Check()
-#include "pycore_code.h"          // _PyCode_GetFreevars()
+#include "pycore_code.h"
 #include "pycore_compile.h"
 #include "pycore_flowgraph.h"     // _PyCfg_FromInstructionSequence()
 #include "pycore_pystate.h"       // _Py_GetConfig()
 #include "pycore_runtime.h"       // _Py_ID()
 #include "pycore_setobject.h"     // _PySet_NextEntry()
+#include "pycore_stats.h"
 #include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString()
 
 #include "cpython/code.h"
diff --git a/Python/errors.c b/Python/errors.c
index d2f331269ed..04b0be089f9 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -4,6 +4,7 @@
 #include "Python.h"
 #include "pycore_audit.h"         // _PySys_Audit()
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
+#include "pycore_fileutils.h"     // _PyFile_Flush
 #include "pycore_initconfig.h"    // _PyStatus_ERR()
 #include "pycore_pyerrors.h"      // _PyErr_Format()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
diff --git a/Python/frame.c b/Python/frame.c
index afb3e768491..166ce078821 100644
--- a/Python/frame.c
+++ b/Python/frame.c
@@ -5,6 +5,7 @@
 #include "frameobject.h"
 #include "pycore_code.h"          // stats
 #include "pycore_frame.h"
+#include "pycore_genobject.h"
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
 #include "opcode.h"
 
diff --git a/Python/getargs.c b/Python/getargs.c
index 6485a714a4e..022a4115038 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -10,6 +10,7 @@
 #include "pycore_pystate.h"       // _Py_IsMainInterpreter()
 #include "pycore_tuple.h"         // _PyTuple_ITEMS()
 #include "pycore_pyerrors.h"      // _Py_CalculateSuggestions()
+#include "pycore_unicodeobject.h" // _PyUnicode_InternImmortal
 
 /* Export Stable ABIs (abi only) */
 PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, const char *, ...);
diff --git a/Python/import.c b/Python/import.c
index 78b380ca6e5..690793edb80 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -8,6 +8,7 @@
 #include "pycore_initconfig.h"    // _PyStatus_OK()
 #include "pycore_interp.h"        // struct _import_runtime_state
 #include "pycore_magic_number.h"  // PYC_MAGIC_NUMBER_TOKEN
+#include "pycore_moduleobject.h"  // _PyModule_GetDef()
 #include "pycore_namespace.h"     // _PyNamespace_Type
 #include "pycore_object.h"        // _Py_SetImmortal()
 #include "pycore_pyerrors.h"      // _PyErr_SetString()
diff --git a/Python/importdl.c b/Python/importdl.c
index 87c44891407..73fedc4ba5f 100644
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -4,7 +4,8 @@
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_import.h"        // _PyImport_SwapPackageContext()
-#include "pycore_importdl.h"      // struct _Py_ext_module_loader_info
+#include "pycore_importdl.h"
+#include "pycore_moduleobject.h"  // _PyModule_GetDef()
 #include "pycore_moduleobject.h"  // _PyModule_GetDef()
 #include "pycore_pyerrors.h"      // _PyErr_FormatFromCause()
 #include "pycore_runtime.h"       // _Py_ID()
diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c
index 5adc1c8a62c..8445546ffdf 100644
--- a/Python/optimizer_symbols.c
+++ b/Python/optimizer_symbols.c
@@ -6,6 +6,7 @@
 #include "pycore_frame.h"
 #include "pycore_long.h"
 #include "pycore_optimizer.h"
+#include "pycore_tuple.h"         // _PyTuple_FromArray()
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index ebe222b736c..41f2174b2d6 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -14,6 +14,7 @@
 #include "pycore_audit.h"         // _PySys_Audit()
 #include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
 #include "pycore_compile.h"       // _PyAST_Compile()
+#include "pycore_fileutils.h"     // _PyFile_Flush
 #include "pycore_interp.h"        // PyInterpreterState.importlib
 #include "pycore_object.h"        // _PyDebug_PrintTotalRefs()
 #include "pycore_parser.h"        // _PyParser_ASTFromString()
diff --git a/Python/specialize.c b/Python/specialize.c
index 0466b5bee90..07c49140446 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -6,7 +6,9 @@
 #include "pycore_critical_section.h"
 #include "pycore_descrobject.h"   // _PyMethodWrapper_Type
 #include "pycore_dict.h"          // DICT_KEYS_UNICODE
+#include "pycore_frame.h"         // FRAME_SPECIALS_SIZE
 #include "pycore_function.h"      // _PyFunction_GetVersionForCurrentState()
+#include "pycore_list.h"          // _PyListIterObject
 #include "pycore_long.h"          // _PyLong_IsNonNegativeCompact()
 #include "pycore_moduleobject.h"
 #include "pycore_object.h"
diff --git a/Python/symtable.c b/Python/symtable.c
index 9e2c0fb7294..b9c45de0a45 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -4,7 +4,7 @@
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_runtime.h"       // _Py_ID()
 #include "pycore_symtable.h"      // PySTEntryObject
-#include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString()
+#include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString
 
 #include <stddef.h>               // offsetof()