bpo-35081: Rename internal headers (GH-10275)
Rename Include/internal/ headers:
* pycore_hash.h -> pycore_pyhash.h
* pycore_lifecycle.h -> pycore_pylifecycle.h
* pycore_mem.h -> pycore_pymem.h
* pycore_state.h -> pycore_pystate.h
Add missing headers to Makefile.pre.in and PCbuild:
* pycore_condvar.h.
* pycore_hamt.h
* pycore_pyhash.h
diff --git a/Include/internal/pycore_hash.h b/Include/internal/pycore_pyhash.h
similarity index 100%
rename from Include/internal/pycore_hash.h
rename to Include/internal/pycore_pyhash.h
diff --git a/Include/internal/pycore_lifecycle.h b/Include/internal/pycore_pylifecycle.h
similarity index 100%
rename from Include/internal/pycore_lifecycle.h
rename to Include/internal/pycore_pylifecycle.h
diff --git a/Include/internal/pycore_mem.h b/Include/internal/pycore_pymem.h
similarity index 100%
rename from Include/internal/pycore_mem.h
rename to Include/internal/pycore_pymem.h
diff --git a/Include/internal/pycore_state.h b/Include/internal/pycore_pystate.h
similarity index 99%
rename from Include/internal/pycore_state.h
rename to Include/internal/pycore_pystate.h
index 01f2140..4f5545a 100644
--- a/Include/internal/pycore_state.h
+++ b/Include/internal/pycore_pystate.h
@@ -12,8 +12,8 @@
#include "pythread.h"
#include "pycore_ceval.h"
-#include "pycore_mem.h"
#include "pycore_pathconfig.h"
+#include "pycore_pymem.h"
#include "pycore_warnings.h"
diff --git a/Include/pystate.h b/Include/pystate.h
index b30c318..58499ea 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -301,7 +301,7 @@
/* Get the current Python thread state.
Macro using PyThreadState_Get() or _PyThreadState_GET() depending if
- pycore_state.h is included or not (this header redefines the macro).
+ pycore_pystate.h is included or not (this header redefines the macro).
If PyThreadState_Get() is used, issue a fatal error if the current thread
state is NULL.
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 15f3687..87a84eb 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1027,13 +1027,16 @@
$(srcdir)/Include/internal/pycore_accu.h \
$(srcdir)/Include/internal/pycore_atomic.h \
$(srcdir)/Include/internal/pycore_ceval.h \
+ $(srcdir)/Include/internal/pycore_condvar.h \
$(srcdir)/Include/internal/pycore_context.h \
$(srcdir)/Include/internal/pycore_getopt.h \
$(srcdir)/Include/internal/pycore_gil.h \
- $(srcdir)/Include/internal/pycore_lifecycle.h \
- $(srcdir)/Include/internal/pycore_mem.h \
+ $(srcdir)/Include/internal/pycore_hamt.h \
$(srcdir)/Include/internal/pycore_pathconfig.h \
- $(srcdir)/Include/internal/pycore_state.h \
+ $(srcdir)/Include/internal/pycore_pyhash.h \
+ $(srcdir)/Include/internal/pycore_pylifecycle.h \
+ $(srcdir)/Include/internal/pycore_pymem.h \
+ $(srcdir)/Include/internal/pycore_pystate.h \
$(srcdir)/Include/internal/pycore_warnings.h \
$(DTRACE_HEADERS)
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 692c3b3..773102b 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -1,7 +1,7 @@
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "structmember.h"
/* _functools module written and maintained
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 24ae963..e1e45dc 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -9,7 +9,7 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "structmember.h"
#include "pythread.h"
#include "_iomodule.h"
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index ad65188..72d044c 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -3,7 +3,7 @@
/* Interface to Sjoerd's portable C thread library */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "structmember.h" /* offsetof */
#include "pythread.h"
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
index fb0b83a..33509ef 100644
--- a/Modules/_xxsubinterpretersmodule.c
+++ b/Modules/_xxsubinterpretersmodule.c
@@ -4,7 +4,7 @@
#include "Python.h"
#include "frameobject.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
static char *
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index a54be07..48b4700 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -25,8 +25,8 @@
#include "Python.h"
#include "pycore_context.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "frameobject.h" /* for PyFrame_ClearFreeList */
#include "pydtrace.h"
#include "pytime.h" /* for _PyTime_GetMonotonicClock() */
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 6b443f6..18df795 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -4,7 +4,7 @@
#include "osdefs.h"
#include "pycore_fileutils.h"
#include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include <sys/types.h>
#include <string.h>
diff --git a/Modules/main.c b/Modules/main.c
index c847d1a..281707a 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -3,10 +3,10 @@
#include "Python.h"
#include "osdefs.h"
#include "pycore_getopt.h"
-#include "pycore_lifecycle.h"
-#include "pycore_mem.h"
#include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pylifecycle.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include <locale.h>
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index bf886e3..bf3e03e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -32,7 +32,7 @@
#else
#include "winreparse.h"
#endif
-#include "pycore_state.h"
+#include "pycore_pystate.h"
/* On android API level 21, 'AT_EACCESS' is not declared although
* HAVE_FACCESSAT is defined. */
diff --git a/Objects/abstract.c b/Objects/abstract.c
index be4758d..567da2d 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1,7 +1,7 @@
/* Abstract Object Interface (many thanks to Jim Fulton) */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include <ctype.h>
#include "structmember.h" /* we need the offsetof() macro from there */
#include "longintrepr.h"
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 7a0c340..561b06c 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2,8 +2,8 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "structmember.h"
#include "bytes_methods.h"
#include "bytesobject.h"
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index c912fc0..fac12f5 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -3,8 +3,8 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "bytes_methods.h"
#include "pystrhex.h"
diff --git a/Objects/call.c b/Objects/call.c
index 707b49a..7c452b9 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "frameobject.h"
diff --git a/Objects/cellobject.c b/Objects/cellobject.c
index 0b390c7..7605bcf 100644
--- a/Objects/cellobject.c
+++ b/Objects/cellobject.c
@@ -1,8 +1,8 @@
/* Cell object implementation */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
PyObject *
PyCell_New(PyObject *obj)
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 93d1c67..79b0562 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -1,8 +1,8 @@
/* Class object implementation (dead now except for methods) */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "structmember.h"
#define TP_DESCR_GET(t) ((t)->tp_descr_get)
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 2450213..a2efa7e 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -3,7 +3,7 @@
#include "Python.h"
#include "code.h"
#include "structmember.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
/* Holder for co_extra information */
typedef struct {
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 17d0f5a..ca814bf 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1,7 +1,7 @@
/* Descriptors -- a new, flexible way to describe attributes */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "structmember.h" /* Why is this not included in Python.h? */
/*[clinic input]
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 08ec9e2..ca383a1 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -111,7 +111,7 @@
#define PyDict_MINSIZE 8
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "dict-common.h"
#include "stringlib/eq.h" /* to get unicode_eq() */
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index da79260..5ab1271 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -6,8 +6,8 @@
#define PY_SSIZE_T_CLEAN
#include <Python.h>
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "structmember.h"
#include "osdefs.h"
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 7704022..70cf580 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -1,7 +1,7 @@
/* Frame object implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "code.h"
#include "frameobject.h"
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 8648821..a8e11a9 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -2,8 +2,8 @@
/* Function object implementation */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "code.h"
#include "structmember.h"
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 7c2948b..98c9394 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -1,7 +1,7 @@
/* Generator object implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "frameobject.h"
#include "structmember.h"
#include "opcode.h"
diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 23f0639..64bf923 100644
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -1,8 +1,8 @@
/* Iterator objects */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
typedef struct {
PyObject_HEAD
diff --git a/Objects/listobject.c b/Objects/listobject.c
index ffd91a6..44160ab 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1,7 +1,7 @@
/* List object implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "pycore_accu.h"
#ifdef STDC_HEADERS
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index f234bb4..060ae4d 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -1,8 +1,8 @@
/* Memoryview object implementation */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "pystrhex.h"
#include <stddef.h>
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index b0bbfa2..cfea8cf 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -2,8 +2,8 @@
/* Method object implementation */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "structmember.h"
/* Free list for method objects to safe malloc/free overhead
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 7fb711a..fca8521 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -2,7 +2,7 @@
/* Module object implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "structmember.h"
static Py_ssize_t max_module_number;
diff --git a/Objects/object.c b/Objects/object.c
index 72e2684..801b205 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -2,7 +2,7 @@
/* Generic object operations; and implementation of None */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "pycore_context.h"
#include "frameobject.h"
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 2cf024c..1c2a320 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "pycore_mem.h"
+#include "pycore_pymem.h"
#include <stdbool.h>
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index 52ac7e5..13bc972 100644
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -465,7 +465,7 @@
*/
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "structmember.h"
#include "dict-common.h"
#include <stddef.h>
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 035b1db..b11cb3a 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -32,7 +32,7 @@
*/
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "structmember.h"
/* Object used as dummy key to fill deleted entries */
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 9f1cf78..1f79faa 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -14,8 +14,8 @@
*/
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "structmember.h"
static PyObject *
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index c997bc6..e7ba09d 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -2,7 +2,7 @@
/* Tuple object implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "pycore_accu.h"
/*[clinic input]
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index dedc4f7..682d446 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1,7 +1,7 @@
/* Type object implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "frameobject.h"
#include "structmember.h"
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5338781..e5d026f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -41,7 +41,7 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "pycore_fileutils.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "ucnhash.h"
#include "bytes_methods.h"
#include "stringlib/eq.h"
diff --git a/PC/getpathp.c b/PC/getpathp.c
index 3a62738..ee9d3d2 100644
--- a/PC/getpathp.c
+++ b/PC/getpathp.c
@@ -80,7 +80,7 @@
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "osdefs.h"
#include <wchar.h>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 460500c..0ae24fa 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -119,10 +119,11 @@
<ClInclude Include="..\Include\internal\pycore_getopt.h" />
<ClInclude Include="..\Include\internal\pycore_gil.h" />
<ClInclude Include="..\Include\internal\pycore_hamt.h" />
- <ClInclude Include="..\Include\internal\pycore_lifecycle.h" />
- <ClInclude Include="..\Include\internal\pycore_mem.h" />
<ClInclude Include="..\Include\internal\pycore_pathconfig.h" />
- <ClInclude Include="..\Include\internal\pycore_state.h" />
+ <ClInclude Include="..\Include\internal\pycore_pyhash.h" />
+ <ClInclude Include="..\Include\internal\pycore_pylifecycle.h" />
+ <ClInclude Include="..\Include\internal\pycore_pymem.h" />
+ <ClInclude Include="..\Include\internal\pycore_pystate.h" />
<ClInclude Include="..\Include\internal\pycore_warnings.h" />
<ClInclude Include="..\Include\intrcheck.h" />
<ClInclude Include="..\Include\iterobject.h" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 64fb77b..ef5ef72 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -156,16 +156,19 @@
<ClInclude Include="..\Include\internal\pycore_hamt.h">
<Filter>Include</Filter>
</ClInclude>
- <ClInclude Include="..\Include\internal\pycore_lifecycle.h">
- <Filter>Include</Filter>
- </ClInclude>
- <ClInclude Include="..\Include\internal\pycore_mem.h">
- <Filter>Include</Filter>
- </ClInclude>
<ClInclude Include="..\Include\internal\pycore_pathconfig.h">
<Filter>Include</Filter>
</ClInclude>
- <ClInclude Include="..\Include\internal\pycore_state.h">
+ <ClInclude Include="..\Include\internal\pycore_pyhash.h">
+ <Filter>Include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Include\internal\pycore_pylifecycle.h">
+ <Filter>Include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Include\internal\pycore_pymem.h">
+ <Filter>Include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Include\internal\pycore_pystate.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_warnings.h">
diff --git a/Parser/myreadline.c b/Parser/myreadline.c
index f511319..acb4d01 100644
--- a/Parser/myreadline.c
+++ b/Parser/myreadline.c
@@ -10,7 +10,7 @@
*/
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#ifdef MS_WINDOWS
#define WIN32_LEAN_AND_MEAN
#include "windows.h"
diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c
index 9e2159b..fa6c882 100644
--- a/Parser/pgenmain.c
+++ b/Parser/pgenmain.c
@@ -16,8 +16,8 @@
#define PGEN
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "pgenheaders.h"
#include "grammar.h"
#include "node.h"
diff --git a/Programs/python.c b/Programs/python.c
index 079bf9a..4c12d38c 100644
--- a/Programs/python.c
+++ b/Programs/python.c
@@ -1,7 +1,7 @@
/* Minimal main program -- everything is loaded from the library */
#include "Python.h"
-#include "pycore_lifecycle.h"
+#include "pycore_pylifecycle.h"
#ifdef MS_WINDOWS
int
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 9b50289..4065005 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "frameobject.h"
#include "clinic/_warnings.c.h"
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 6781589..14550fd 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -3,7 +3,7 @@
#include "Python.h"
#include <ctype.h>
#include "ast.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
_Py_IDENTIFIER(__builtins__);
_Py_IDENTIFIER(__dict__);
diff --git a/Python/ceval.c b/Python/ceval.c
index 11be8ef..9c0ab06 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -10,7 +10,7 @@
#define PY_LOCAL_AGGRESSIVE
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "code.h"
#include "dictobject.h"
diff --git a/Python/codecs.c b/Python/codecs.c
index 62bbee6..002fad30 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -9,7 +9,7 @@
------------------------------------------------------------------------ */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "ucnhash.h"
#include <ctype.h>
diff --git a/Python/context.c b/Python/context.c
index 1fb2a5d..b548ffe 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -1,7 +1,7 @@
#include "Python.h"
#include "structmember.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "pycore_context.h"
#include "pycore_hamt.h"
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index c81cd8b..7aa64e1 100644
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -1,9 +1,9 @@
#include "Python.h"
#include "pycore_fileutils.h"
-#include "pycore_lifecycle.h"
-#include "pycore_mem.h"
+#include "pycore_pylifecycle.h"
+#include "pycore_pymem.h"
#include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include <locale.h>
#ifdef HAVE_LANGINFO_H
# include <langinfo.h>
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 9896560..feebd89 100644
--- a/Python/dynload_shlib.c
+++ b/Python/dynload_shlib.c
@@ -2,7 +2,7 @@
/* Support for dynamic loading of extension modules */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "importdl.h"
#include <sys/types.h>
diff --git a/Python/errors.c b/Python/errors.c
index 4c6c34c..febe971 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -2,7 +2,7 @@
/* Error handling */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#ifndef __STDC__
#ifndef MS_WINDOWS
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index 9e90666..6160909 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -2,7 +2,7 @@
/* Python interpreter main program for frozen scripts */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include <locale.h>
#ifdef MS_WINDOWS
diff --git a/Python/hamt.c b/Python/hamt.c
index be3813b..3fe70b40 100644
--- a/Python/hamt.c
+++ b/Python/hamt.c
@@ -1,7 +1,7 @@
#include "Python.h"
#include "structmember.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "pycore_hamt.h"
/*
diff --git a/Python/import.c b/Python/import.c
index fcd8851..f7c37aa 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -3,10 +3,10 @@
#include "Python.h"
#include "Python-ast.h"
-#include "pycore_hash.h"
-#include "pycore_lifecycle.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pyhash.h"
+#include "pycore_pylifecycle.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "errcode.h"
#include "marshal.h"
#include "code.h"
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 2d8b417..6a86880 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -2,10 +2,10 @@
#include "Python.h"
#include "osdefs.h"
-#include "pycore_mem.h"
#include "pycore_fileutils.h"
#include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include <wchar.h>
#ifdef __cplusplus
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 318d7cb..4ccea2e 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -5,10 +5,10 @@
#include "Python-ast.h"
#include "pycore_context.h"
#include "pycore_hamt.h"
-#include "pycore_lifecycle.h"
-#include "pycore_mem.h"
#include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pylifecycle.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#include "grammar.h"
#include "node.h"
#include "token.h"
diff --git a/Python/pystate.c b/Python/pystate.c
index c193a10..f86f5a9 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -2,8 +2,8 @@
/* Thread and interpreter state structures and their interfaces */
#include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
#define _PyThreadState_SET(value) \
_Py_atomic_store_relaxed(&_PyRuntime.gilstate.tstate_current, \
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2b9f4f0..1bf822c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -11,7 +11,7 @@
#include "Python.h"
#include "Python-ast.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "grammar.h"
#include "node.h"
#include "token.h"
diff --git a/Python/symtable.c b/Python/symtable.c
index 40f9178..c095c82 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "symtable.h"
#include "structmember.h"
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index c0f168c..99cab2b 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -17,10 +17,10 @@
#include "Python.h"
#include "code.h"
#include "frameobject.h"
-#include "pycore_lifecycle.h"
-#include "pycore_mem.h"
+#include "pycore_pylifecycle.h"
+#include "pycore_pymem.h"
#include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "pythread.h"
#include "osdefs.h"
diff --git a/Python/thread.c b/Python/thread.c
index 6355381..c5364f9 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -6,7 +6,7 @@
Stuff shared by all thread_*.h files is collected here. */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#ifndef _POSIX_THREADS
/* This means pthreads are not implemented in libc headers, hence the macro
diff --git a/Python/traceback.c b/Python/traceback.c
index e2070f0..daaf287 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -2,7 +2,7 @@
/* Traceback implementation */
#include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
#include "code.h"
#include "frameobject.h"