From e3fb974fc7cae4ec946efd40f43d97fbef5dbc10 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 23 Jan 2024 09:00:02 -0800
Subject: [PATCH] Fixed ambiguity between std::byte and byte in rpcndr.h

Fixes https://github.com/libsdl-org/SDL/issues/8911

(cherry picked from commit a71f99c71f785e88db0b48599bb52ebe76e2b78e)
(cherry picked from commit 9196584773219f43d0294623322ffe2af358690e)
---
 src/core/winrt/SDL_winrtapp_direct3d.cpp | 6 ------
 src/video/winrt/SDL_winrtvideo.cpp       | 4 +---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/core/winrt/SDL_winrtapp_direct3d.cpp b/src/core/winrt/SDL_winrtapp_direct3d.cpp
index 034c31e76e..2cf7b405e5 100644
--- a/src/core/winrt/SDL_winrtapp_direct3d.cpp
+++ b/src/core/winrt/SDL_winrtapp_direct3d.cpp
@@ -20,12 +20,6 @@
 */
 #include "../../SDL_internal.h"
 
-/* Standard C++11 includes */
-#include <functional>
-#include <string>
-#include <sstream>
-using namespace std;
-
 /* Windows includes */
 #include "ppltasks.h"
 using namespace concurrency;
diff --git a/src/video/winrt/SDL_winrtvideo.cpp b/src/video/winrt/SDL_winrtvideo.cpp
index e3365b1db3..9160bbb638 100644
--- a/src/video/winrt/SDL_winrtvideo.cpp
+++ b/src/video/winrt/SDL_winrtvideo.cpp
@@ -29,10 +29,8 @@
  */
 
 /* Standard C++11 includes */
-#include <functional>
-#include <string>
 #include <sstream>
-using namespace std;
+#include <string>
 
 /* Windows includes */
 #include <agile.h>