diff --git a/Misc/NEWS.d/next/Build/2021-10-22-14-00-44.bpo-43974.HHZtbx.rst b/Misc/NEWS.d/next/Build/2021-10-22-14-00-44.bpo-43974.HHZtbx.rst
@@ -0,0 +1,2 @@
@@ -99,26 +99,26 @@ PYTHONPATH=$(COREPYTHONPATH)
# cannot be built as shared!

_collections _collectionsmodule.c
-_abc -DPy_BUILD_CORE_BUILTIN _abc.c
_codecs _codecsmodule.c
-_functools -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _functoolsmodule.c
-_io -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
-_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c  # -lintl
-_operator -DPy_BUILD_CORE_BUILTIN _operator.c
-_signal -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal signalmodule.c
-_sre -DPy_BUILD_CORE_BUILTIN _sre.c
_stat _stat.c
_symtable symtablemodule.c  # setup.py can't track the .h file that _symtable depends on.
-_thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c
_tracemalloc _tracemalloc.c  # See bpo-35053 as to why this is built in.
_weakref _weakref.c
atexit atexitmodule.c
errno errnomodule.c
faulthandler faulthandler.c
itertools itertoolsmodule.c
-posix -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal posixmodule.c
pwd pwdmodule.c
-time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c


# ---
@@ -139,7 +139,7 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c

#_asyncio _asynciomodule.c
#_bisect _bisectmodule.c
-#_blake2 -DPy_BUILD_CORE_BUILTIN _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
#_codecs_cn cjkcodecs/_codecs_cn.c
#_codecs_hk cjkcodecs/_codecs_hk.c
#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
@@ -150,31 +150,31 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
#_csv _csv.c
#_datetime _datetimemodule.c
#_elementtree -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -I$(srcdir)/Modules/expat _elementtree.c
-#_heapq -DPy_BUILD_CORE_MODULE _heapqmodule.c
-#_json -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _json.c
#_lsprof _lsprof.c rotatingtree.c
-#_md5 -DPy_BUILD_CORE_BUILTIN md5module.c
#_multibytecodec cjkcodecs/multibytecodec.c
#_opcode _opcode.c
-#_pickle -DPy_BUILD_CORE_MODULE _pickle.c
-#_posixsubprocess -DPy_BUILD_CORE_BUILTIN _posixsubprocess.c
-#_queue -DPy_BUILD_CORE_MODULE _queuemodule.c
-#_random -DPy_BUILD_CORE_MODULE _randommodule.c
-#_sha1 -DPy_BUILD_CORE_BUILTIN sha1module.c
-#_sha256 -DPy_BUILD_CORE_BUILTIN sha256module.c
-#_sha512 -DPy_BUILD_CORE_BUILTIN sha512module.c
-#_sha3 -DPy_BUILD_CORE_BUILTIN _sha3/sha3module.c
#_statistics _statisticsmodule.c
-#_struct -DPy_BUILD_CORE_MODULE _struct.c
#_typing _typingmodule.c
-#_zoneinfo -DPy_BUILD_CORE_MODULE _zoneinfo.c
-#array -DPy_BUILD_CORE_MODULE arraymodule.c
#audioop audioop.c
-#binascii -DPy_BUILD_CORE_MODULE binascii.c
-#cmath -DPy_BUILD_CORE_MODULE cmathmodule.c _math.c  # -lm
-#math -DPy_BUILD_CORE_MODULE mathmodule.c _math.c  # -lm
#pyexpat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI -I$(srcdir)/Modules/expat  expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c
-#unicodedata  -DPy_BUILD_CORE_BUILTIN unicodedata.c

# Modules with some UNIX dependencies -- on by default:
# (If you have a really backward UNIX, select and socket may not be
@@ -286,7 +286,7 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
# provided by the ncurses library.  e.g. on Linux, link with -lncurses
# instead of -lcurses).

-#_curses -DPy_BUILD_CORE_MODULE -lcurses -ltermcap _cursesmodule.c

# Wrapper for the panel library that's part of ncurses and SYSV curses.
#_curses_panel -lpanel -lncurses _curses_panel.c
@@ -305,7 +305,7 @@ xxsubtype xxsubtype.c  # Required for the test suite to pass!
#_testbuffer _testbuffer.c
#_testcapi _testcapimodule.c  # CANNOT be statically compiled!
#_testimportmultiple _testimportmultiple.c
-#_testinternalcapi -DPy_BUILD_CORE_MODULE -I$(srcdir)/Include/internal _testinternalcapi.c
#_testmultiphase _testmultiphase.c



diff --git a/Modules/_abc.c b/Modules/_abc.c
@@ -1,4 +1,7 @@
/* ABCMeta implementation */

#include "Python.h"
#include "pycore_moduleobject.h"  // _PyModule_GetState()

@@ -1,3 +1,7 @@
#include "Python.h"
#include "pycore_pyerrors.h"      // _PyErr_ClearExcState()
#include "pycore_pystate.h"       // _PyThreadState_GET()

@@ -13,6 +13,10 @@
 * The blake2s_impl.c is autogenerated from blake2b_impl.c.
 */

#include "Python.h"
#include "pycore_strhex.h"       // _Py_strhex()


@@ -8,6 +8,10 @@
 * any warranty. http://creativecommons.org/publicdomain/zero/1.0/
 */

#include "Python.h"

#include "impl/blake2.h"

@@ -13,6 +13,10 @@
 * The blake2s_impl.c is autogenerated from blake2s_impl.c.
 */

#include "Python.h"
#include "pycore_strhex.h"        // _Py_strhex()


diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -98,6 +98,9 @@ bytes(cdata)
 * PyCField_Type
 *
 */

#define PY_SSIZE_T_CLEAN


diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
@@ -1,3 +1,7 @@
#include "Python.h"
// windows.h must be included before pycore internal headers
#ifdef MS_WIN32

diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
@@ -1,3 +1,7 @@
#include "Python.h"
// windows.h must be included before pycore internal headers
#ifdef MS_WIN32

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
@@ -1,3 +1,7 @@
#include "Python.h"
// windows.h must be included before pycore internal headers
#ifdef MS_WIN32

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -100,6 +100,10 @@ static const char PyCursesVersion[] = "2.2";

/* Includes */

#define PY_SSIZE_T_CLEAN

#include "Python.h"

@@ -7,6 +7,10 @@
 * the capsule are defined below */
#define _PY_DATETIME_IMPL

#include "Python.h"
#include "pycore_long.h"          // _PyLong_GetOne()
#include "pycore_object.h"        // _PyObject_Init()

@@ -18,6 +18,10 @@
#endif
#define OPENSSL_NO_DEPRECATED 1

#define PY_SSIZE_T_CLEAN

#include "Python.h"

@@ -6,6 +6,10 @@ annotated by François Pinard, and converted to C by Raymond Hettinger.

*/

#include "Python.h"
#include "pycore_list.h"          // _PyList_ITEMS()


diff --git a/Modules/_json.c b/Modules/_json.c
@@ -4,8 +4,8 @@
 * and as an extension module (Py_BUILD_CORE_MODULE define) on other
 * platforms. */

-#if !defined(Py_BUILD_CORE_BUILTIN) && !defined(Py_BUILD_CORE_MODULE)
-#  error "Py_BUILD_CORE_BUILTIN or Py_BUILD_CORE_MODULE must be defined"
#endif

#include "Python.h"

diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
@@ -1,3 +1,7 @@
#include "Python.h"
#include "pycore_call.h"          // _PyObject_CallNoArgs()
#include "pycore_pystate.h"       // _PyThreadState_GET()

diff --git a/Modules/_math.c b/Modules/_math.c
@@ -1,6 +1,10 @@
/* Definitions of some C99 math library functions, for those platforms
   that don't implement these functions already. */

#include "Python.h"
#include <float.h>
#include "_math.h"

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -4,8 +4,8 @@
 * and as an extension module (Py_BUILD_CORE_MODULE define) on other
 * platforms. */

-#if !defined(Py_BUILD_CORE_BUILTIN) && !defined(Py_BUILD_CORE_MODULE)
-#  error "Py_BUILD_CORE_BUILTIN or Py_BUILD_CORE_MODULE must be defined"
#endif

#include "Python.h"

@@ -1,4 +1,8 @@
/* Authors: Gregory P. Smith & Jeffrey Yasskin */
#include "Python.h"
#include "pycore_fileutils.h"
#if defined(HAVE_PIPE2) && !defined(_GNU_SOURCE)

diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c
@@ -1,3 +1,7 @@
#include "Python.h"
#include "pycore_moduleobject.h"  // _PyModule_GetState()
#include "structmember.h"         // PyMemberDef

@@ -66,6 +66,10 @@

/* ---------------------------------------------------------------*/

#include "Python.h"
#include "pycore_moduleobject.h"  // _PyModule_GetState()
#ifdef HAVE_PROCESS_H

diff --git a/Modules/_struct.c b/Modules/_struct.c
@@ -3,6 +3,10 @@
/* New version supporting byte order, alignment and size options,
   character strings, and unsigned numbers */

#define PY_SSIZE_T_CLEAN

#include "Python.h"

@@ -1,6 +1,9 @@

/* Testing module for multi-phase initialization of extension modules (PEP 489)
 */

#include "Python.h"
#include "pycore_namespace.h"     // _PyNamespace_New()

diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -1,6 +1,9 @@

/* interpreters module */
/* low-level access to interpreter primitives */

#include "Python.h"
#include "frameobject.h"

@@ -1,3 +1,7 @@
#include "Python.h"
#include "pycore_long.h"          // _PyLong_GetOne()
#include "structmember.h"

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -3,6 +3,10 @@
/* An array is a uniform list -- all items have the same type.
   The item type is restricted to simple C types like int or float */

#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "pycore_floatobject.h"   // _PyFloat_Unpack4()
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,10 @@ @@
      * The blake2s_impl.c is autogenerated from blake2b_impl.c.
      */
     #include "Python.h"
     #include "pycore_strhex.h"       // _Py_strhex()
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,6 +100,10 @@ static const char PyCursesVersion[] = "2.2";

		/* Includes */

		#define PY_SSIZE_T_CLEAN

		#include "Python.h"
Original file line number	Diff line number	Diff line change
		@@ -6,6 +6,10 @@ annotated by François Pinard, and converted to C by Raymond Hettinger.

		*/

		#include "Python.h"
		#include "pycore_list.h" // _PyList_ITEMS()

Expand Down