diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a11a368fd83..fe4b1482869 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,6 +95,8 @@ jobs:
     runs-on: windows-latest
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    env:
+       IncludeUwp: 'true'
     steps:
     - uses: actions/checkout@v2
     - name: Build CPython
@@ -109,6 +111,8 @@ jobs:
     runs-on: windows-latest
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    env:
+       IncludeUwp: 'true'
     steps:
     - uses: actions/checkout@v2
     - name: Register MSVC problem matcher
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
index 05641001bcd..76f3c5268ee 100644
--- a/Include/cpython/initconfig.h
+++ b/Include/cpython/initconfig.h
@@ -1,6 +1,9 @@
 #ifndef Py_PYCORECONFIG_H
 #define Py_PYCORECONFIG_H
 #ifndef Py_LIMITED_API
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* --- PyStatus ----------------------------------------------- */
 
@@ -243,5 +246,8 @@ PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
    See also PyConfig.orig_argv. */
 PyAPI_FUNC(void) Py_GetArgcArgv(int *argc, wchar_t ***argv);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* !Py_LIMITED_API */
 #endif /* !Py_PYCORECONFIG_H */