diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 68fc036..1192961 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -119,11 +119,7 @@
 /* Bootstrap __main__ (defined in Modules/main.c) */
 PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv);
 #ifdef Py_BUILD_CORE
-#  ifdef MS_WINDOWS
-PyAPI_FUNC(int) _Py_WindowsMain(int argc, wchar_t **argv);
-#  else
 PyAPI_FUNC(int) _Py_UnixMain(int argc, char **argv);
-#  endif
 #endif
 
 /* In getpath.c */
diff --git a/Include/pystate.h b/Include/pystate.h
index c2ccb20..f16ffb8 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -41,6 +41,8 @@
     int show_alloc_count;   /* -X showalloccount */
     int dump_refs;          /* PYTHONDUMPREFS */
     int malloc_stats;       /* PYTHONMALLOCSTATS */
+    int coerce_c_locale;    /* PYTHONCOERCECLOCALE, -1 means unknown */
+    int coerce_c_locale_warn; /* PYTHONCOERCECLOCALE=warn */
     int utf8_mode;          /* PYTHONUTF8, -X utf8; -1 means unknown */
 
     wchar_t *program_name;  /* Program name, see also Py_GetProgramName() */
@@ -72,8 +74,6 @@
 
     /* Private fields */
     int _disable_importlib; /* Needed by freeze_importlib */
-    int _coerce_c_locale;    /* PYTHONCOERCECLOCALE, -1 means unknown */
-    int _coerce_c_locale_warn; /* PYTHONCOERCECLOCALE=warn */
 } _PyCoreConfig;
 
 #define _PyCoreConfig_INIT \
@@ -81,8 +81,7 @@
         .install_signal_handlers = -1, \
         .ignore_environment = -1, \
         .use_hash_seed = -1, \
-        ._coerce_c_locale = 0, \
-        ._coerce_c_locale_warn = 0, \
+        .coerce_c_locale = -1, \
         .faulthandler = -1, \
         .tracemalloc = -1, \
         .utf8_mode = -1, \