From 0928c201297274164f5521eb5a45cc6d85d83acb Mon Sep 17 00:00:00 2001
From: grcm10 <grcm10@outlook.com>
Date: Fri, 8 Sep 2023 16:38:08 +0900
Subject: [PATCH 1/2] Remove unnecessary #include "awint.hpp"

---
 stl/src/cthread.cpp       | 2 --
 stl/src/dllmain.cpp       | 2 --
 stl/src/primitives.hpp    | 2 +-
 stl/src/taskscheduler.cpp | 1 -
 stl/src/winapisupp.cpp    | 2 +-
 stl/src/xalloc.cpp        | 2 --
 stl/src/xdateord.cpp      | 2 +-
 stl/src/xgetwctype.cpp    | 2 +-
 stl/src/xmtx.cpp          | 2 --
 stl/src/xonce.cpp         | 2 +-
 10 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/stl/src/cthread.cpp b/stl/src/cthread.cpp
index 618037bbfdf..3ab8f0998ff 100644
--- a/stl/src/cthread.cpp
+++ b/stl/src/cthread.cpp
@@ -12,8 +12,6 @@
 
 #include <Windows.h>
 
-#include "awint.hpp"
-
 namespace {
     using _Thrd_start_t = int (*)(void*);
 
diff --git a/stl/src/dllmain.cpp b/stl/src/dllmain.cpp
index 990edfbfe41..9cf64d30fa5 100644
--- a/stl/src/dllmain.cpp
+++ b/stl/src/dllmain.cpp
@@ -5,8 +5,6 @@
 
 #include <Windows.h>
 
-#include "awint.hpp"
-
 #ifdef _CRT_APP
 // free static resource used by causality
 extern "C" void __cdecl __crtCleanupCausalityStaticFactories();
diff --git a/stl/src/primitives.hpp b/stl/src/primitives.hpp
index 89d35a2c7da..15dd3f6237e 100644
--- a/stl/src/primitives.hpp
+++ b/stl/src/primitives.hpp
@@ -6,7 +6,7 @@
 #include <exception>
 #include <new>
 
-#include "awint.hpp"
+#include <Windows.h>
 
 namespace Concurrency {
     namespace details {
diff --git a/stl/src/taskscheduler.cpp b/stl/src/taskscheduler.cpp
index 6f6154f2bd0..8a7e5385c45 100644
--- a/stl/src/taskscheduler.cpp
+++ b/stl/src/taskscheduler.cpp
@@ -8,7 +8,6 @@
 
 #include <Windows.h>
 
-#include "awint.hpp"
 #include "init_locks.hpp"
 
 #pragma warning(disable : 4074)
diff --git a/stl/src/winapisupp.cpp b/stl/src/winapisupp.cpp
index fa3a9cbb870..4510f38958e 100644
--- a/stl/src/winapisupp.cpp
+++ b/stl/src/winapisupp.cpp
@@ -5,9 +5,9 @@
 // Prevent clang-format from reordering <AppModel.h> before <Windows.h>
 #include <Windows.h>
 #include <AppModel.h> // for APPMODEL_ERROR_NO_PACKAGE
-#include "awint.hpp"
 #include <internal_shared.h>
 #include <cstdlib>
+#include <yvals.h>
 // clang-format on
 
 #pragma warning(push)
diff --git a/stl/src/xalloc.cpp b/stl/src/xalloc.cpp
index 379f506e888..6ee0312c4aa 100644
--- a/stl/src/xalloc.cpp
+++ b/stl/src/xalloc.cpp
@@ -7,8 +7,6 @@
 
 #include <Windows.h>
 
-#include "awint.hpp"
-
 namespace stdext {
     namespace threads {
 
diff --git a/stl/src/xdateord.cpp b/stl/src/xdateord.cpp
index 95b77ac67b1..3e2f26c99bd 100644
--- a/stl/src/xdateord.cpp
+++ b/stl/src/xdateord.cpp
@@ -5,7 +5,7 @@
 
 #include <locale>
 
-#include "awint.hpp"
+#include <Windows.h>
 
 _EXTERN_C_UNLESS_PURE
 
diff --git a/stl/src/xgetwctype.cpp b/stl/src/xgetwctype.cpp
index 698e73a581e..3e8c6b591dc 100644
--- a/stl/src/xgetwctype.cpp
+++ b/stl/src/xgetwctype.cpp
@@ -8,7 +8,7 @@
 #include <__msvc_xlocinfo_types.hpp>
 #include <cwchar>
 
-#include "awint.hpp"
+#include <Windows.h>
 
 _EXTERN_C_UNLESS_PURE
 
diff --git a/stl/src/xmtx.cpp b/stl/src/xmtx.cpp
index a8cc5eb89f6..b10bba2ce6d 100644
--- a/stl/src/xmtx.cpp
+++ b/stl/src/xmtx.cpp
@@ -5,8 +5,6 @@
 
 #include "xmtx.hpp"
 
-#include "awint.hpp"
-
 _EXTERN_C_UNLESS_PURE
 
 // Win32 critical sections are recursive
diff --git a/stl/src/xonce.cpp b/stl/src/xonce.cpp
index b145b118d3b..f63352c3c92 100644
--- a/stl/src/xonce.cpp
+++ b/stl/src/xonce.cpp
@@ -5,7 +5,7 @@
 
 #include <mutex>
 
-#include "awint.hpp"
+#include <Windows.h>
 
 namespace {
     struct _Xfg_trampoline_parameter {

From eb5ffa885b12d8fd53822517ebb42493ec9850c0 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@nuwen.net>
Date: Fri, 8 Sep 2023 12:27:32 -0700
Subject: [PATCH 2/2] Also update winapinls.cpp.

---
 stl/src/winapinls.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stl/src/winapinls.cpp b/stl/src/winapinls.cpp
index 38e2b0c63f8..4b5209826d9 100644
--- a/stl/src/winapinls.cpp
+++ b/stl/src/winapinls.cpp
@@ -5,7 +5,9 @@
 
 #if _STL_WIN32_WINNT < _STL_WIN32_WINNT_VISTA
 
-#include "awint.hpp"
+#include <yvals.h>
+
+#include <Windows.h>
 
 // TRANSITION, ABI: preserved for binary compatibility
 extern "C" _CRTIMP2 int __cdecl __crtCompareStringEx(_In_opt_ LPCWSTR lpLocaleName, _In_ DWORD dwCmpFlags,