diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -19,6 +19,7 @@ PyAPI_FUNC(void) _PyEval_FiniThreads(
PyAPI_FUNC(void) _PyEval_SignalReceived(
    struct _ceval_runtime_state *ceval);
PyAPI_FUNC(int) _PyEval_AddPendingCall(
    struct _ceval_runtime_state *ceval,
    int (*func)(void *),
    void *arg);

diff --git a/Include/internal/pycore_pyerrors.h b/Include/internal/pycore_pyerrors.h
@@ -0,0 +1,62 @@
diff --git a/Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_pylifecycle.h
@@ -106,6 +106,8 @@ PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p);

PyAPI_FUNC(PyObject*) _PyErr_WriteUnraisableDefaultHook(PyObject *unraisable);

#ifdef __cplusplus
}
#endif

diff --git a/Include/internal/pycore_pymem.h b/Include/internal/pycore_pymem.h
@@ -1,5 +1,5 @@
-#ifndef Py_INTERNAL_MEM_H
-#define Py_INTERNAL_MEM_H
#ifdef __cplusplus
extern "C" {
#endif
@@ -191,4 +191,4 @@ PyAPI_FUNC(int) _PyMem_SetupAllocators(PyMemAllocatorName allocator);
#ifdef __cplusplus
}
#endif
-#endif /* !Py_INTERNAL_MEM_H */
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1077,6 +1077,7 @@ PYTHON_HEADERS= \
		$(srcdir)/Include/internal/pycore_hamt.h \
		$(srcdir)/Include/internal/pycore_object.h \
		$(srcdir)/Include/internal/pycore_pathconfig.h \
		$(srcdir)/Include/internal/pycore_pyhash.h \
		$(srcdir)/Include/internal/pycore_pylifecycle.h \
		$(srcdir)/Include/internal/pycore_pymem.h \

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -258,6 +258,7 @@ trip_signal(int sig_num)

    /* Notify ceval.c */
    _PyRuntimeState *runtime = &_PyRuntime;
    _PyEval_SignalReceived(&runtime->ceval);

    /* And then write to the wakeup fd *after* setting all the globals and
@@ -298,7 +299,7 @@ trip_signal(int sig_num)
                {
                    /* Py_AddPendingCall() isn't signal-safe, but we
                       still use it for this exceptional case. */
-                    _PyEval_AddPendingCall(&runtime->ceval,
                                           report_wakeup_send_error,
                                           (void *)(intptr_t) last_error);
                }
@@ -317,7 +318,7 @@ trip_signal(int sig_num)
                {
                    /* Py_AddPendingCall() isn't signal-safe, but we
                       still use it for this exceptional case. */
-                    _PyEval_AddPendingCall(&runtime->ceval,
                                           report_wakeup_write_error,
                                           (void *)(intptr_t)errno);
                }

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
@@ -168,6 +168,7 @@
    <ClInclude Include="..\Include\internal\pycore_hamt.h" />
    <ClInclude Include="..\Include\internal\pycore_object.h" />
    <ClInclude Include="..\Include\internal\pycore_pathconfig.h" />
    <ClInclude Include="..\Include\internal\pycore_pyhash.h" />
    <ClInclude Include="..\Include\internal\pycore_pylifecycle.h" />
    <ClInclude Include="..\Include\internal\pycore_pymem.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
@@ -207,6 +207,9 @@
    <ClInclude Include="..\Include\internal\pycore_pathconfig.h">
      <Filter>Include</Filter>
    </ClInclude>
    <ClInclude Include="..\Include\internal\pycore_pyhash.h">
      <Filter>Include</Filter>
    </ClInclude>
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,8 @@ PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p); @@
     PyAPI_FUNC(PyObject*) _PyErr_WriteUnraisableDefaultHook(PyObject *unraisable);
     #ifdef __cplusplus
     }
     #endif
@@ Expand Down @@