diff --git a/src/common/Debugging/Windows/WheatyExceptionReport.cpp b/src/common/Debugging/Windows/WheatyExceptionReport.cpp
index 077c76effd9..87b7eb6f096 100644
--- a/src/common/Debugging/Windows/WheatyExceptionReport.cpp
+++ b/src/common/Debugging/Windows/WheatyExceptionReport.cpp
@@ -7,8 +7,9 @@
 #include "Errors.h"
 #include "GitRevision.h"
 #include "Memory.h"
-#include <stdexcept>
 #include <algorithm>
+#include <charconv>
+#include <stdexcept>
 #include <utility>
 
 #ifdef __clang__
@@ -16,12 +17,11 @@
 #define _ThrowInfo ThrowInfo
 #endif
 
+#include <comdef.h>
 #include <ehdata.h>
 #include <rttidata.h>
-#include <tlhelp32.h>
 #include <tchar.h>
-
-#include <comdef.h>
+#include <tlhelp32.h>
 #include <WbemIdl.h>
 
 #define CrashFolder _T("Crashes")
diff --git a/src/common/Debugging/Windows/WheatyExceptionReport.h b/src/common/Debugging/Windows/WheatyExceptionReport.h
index 5d50a85513e..90e44c07020 100644
--- a/src/common/Debugging/Windows/WheatyExceptionReport.h
+++ b/src/common/Debugging/Windows/WheatyExceptionReport.h
@@ -6,14 +6,15 @@
 #include "Define.h"
 #include "Optional.h"
 #include <Windows.h>
+#include <dbghelp.h>
 #include <winnt.h>
 #include <winternl.h>
-#include <dbghelp.h>
 #include <compare>
 #include <set>
-#include <cstdlib>
-#include <cstdio>
 #include <stack>
+#include <string>
+#include <cstdio>
+#include <cstdlib>
 
 #define WER_MAX_ARRAY_ELEMENTS_COUNT 10
 #define WER_MAX_NESTING_LEVEL 4