From fff80cd2488899a322f9e673930a00eb9ab5b165 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 5 Jan 2023 19:36:10 +0000
Subject: [PATCH 1/2] random: remove windows-only compat.h include in randomenv

Note that this was probably only here to indirectly receive windows.h
via another include in compat.h (windows.h or winreg.h aren't included
there).

Also note that compat.h is already pulled in here for everyone via
util/time.h, so including inside a windows only ifdef is secondarily
redundant.
---
 src/randomenv.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/randomenv.cpp b/src/randomenv.cpp
index 0b97d747cb2..5b5b7c078d3 100644
--- a/src/randomenv.cpp
+++ b/src/randomenv.cpp
@@ -15,7 +15,8 @@
 #include <support/cleanse.h>
 #include <util/time.h> // for GetTime()
 #ifdef WIN32
-#include <compat/compat.h>
+#include <windows.h>
+#include <winreg.h>
 #endif
 
 #include <algorithm>

From b358bde020e2b9f6249fdbc500db6cb30f500f19 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 5 Jan 2023 19:40:39 +0000
Subject: [PATCH 2/2] randomenv: consolidate WIN32 #ifdefs

Order includes.
Remove // for xyz comments
---
 src/randomenv.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/randomenv.cpp b/src/randomenv.cpp
index 5b5b7c078d3..8c00ffb818c 100644
--- a/src/randomenv.cpp
+++ b/src/randomenv.cpp
@@ -13,22 +13,21 @@
 #include <compat/cpuid.h>
 #include <crypto/sha512.h>
 #include <support/cleanse.h>
-#include <util/time.h> // for GetTime()
-#ifdef WIN32
-#include <windows.h>
-#include <winreg.h>
-#endif
+#include <util/time.h>
 
 #include <algorithm>
 #include <atomic>
+#include <cstdint>
+#include <cstring>
 #include <chrono>
 #include <climits>
 #include <thread>
 #include <vector>
 
-#include <stdint.h>
-#include <string.h>
-#ifndef WIN32
+#ifdef WIN32
+#include <windows.h>
+#include <winreg.h>
+#else
 #include <sys/types.h> // must go before a number of other headers
 #include <fcntl.h>
 #include <netinet/in.h>