From 4d3a18d9ff7db4570fedcc2f89354c41c31b9513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 26 Apr 2020 22:27:04 +0200
Subject: [PATCH] Windows: Appease capricious MSVC versions with moody headers

Fixes #37799.
Fixes #37986.
---
 platform/windows/crash_handler_windows.cpp | 4 +++-
 thirdparty/basis_universal/basisu_enc.h    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/windows/crash_handler_windows.cpp b/platform/windows/crash_handler_windows.cpp
index 1d9eba22d81..996d9722f53 100644
--- a/platform/windows/crash_handler_windows.cpp
+++ b/platform/windows/crash_handler_windows.cpp
@@ -38,11 +38,13 @@
 
 // Backtrace code code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app
 
-#include <psapi.h>
 #include <algorithm>
 #include <iterator>
+#include <string>
 #include <vector>
 
+#include <psapi.h>
+
 #pragma comment(lib, "psapi.lib")
 #pragma comment(lib, "dbghelp.lib")
 
diff --git a/thirdparty/basis_universal/basisu_enc.h b/thirdparty/basis_universal/basisu_enc.h
index c2b9133045c..0a0c3c6fc09 100644
--- a/thirdparty/basis_universal/basisu_enc.h
+++ b/thirdparty/basis_universal/basisu_enc.h
@@ -22,6 +22,7 @@
 #include <functional>
 #include <thread>
 #include <unordered_map>
+#include <ostream>
 
 #if !defined(_WIN32) || defined(__MINGW32__)
 #include <libgen.h>