Fix Windows build; use WIN32_LEAN_AND_MEAN in more places

src/openrct2-win/openrct2-win.cpp

@@ -8,6 +8,9 @@
  *****************************************************************************/
 
 // Windows.h needs to be included first
+#ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 // Enable visual styles

src/openrct2/core/Crypt.CNG.cpp

@@ -24,12 +24,17 @@
     #include <tuple>
 
 // clang-format off
-// CNG: Cryptography API: Next Generation (CNG)
-//      available in Windows Vista onwards.
-#include <windows.h>
-#include <wincrypt.h>
-#include <bcrypt.h>
-constexpr bool NT_SUCCESS(NTSTATUS status) {return status >= 0;}
+    // windows.h needs to be included first
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
+    #include <windows.h>
+
+    // CNG: Cryptography API: Next Generation (CNG)
+    //      available in Windows Vista onwards.
+    #include <wincrypt.h>
+    #include <bcrypt.h>
+    constexpr bool NT_SUCCESS(NTSTATUS status) {return status >= 0;}
 // clang-format on
 
 using namespace OpenRCT2::Crypt;

src/openrct2/core/Diagnostics.cpp

@@ -8,6 +8,9 @@
  *****************************************************************************/
 
 #if defined(DEBUG) && defined(_WIN32)
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
 #endif
 

src/openrct2/core/File.cpp

@@ -8,6 +8,9 @@
  *****************************************************************************/
 
 #ifdef _WIN32
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
 #else
     #include <sys/stat.h>

src/openrct2/core/FileScanner.cpp

@@ -8,6 +8,9 @@
  *****************************************************************************/
 
 #ifdef _WIN32
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
 #elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
     #include <dirent.h>

src/openrct2/core/FileWatcher.cpp

@@ -15,6 +15,9 @@
 #include <stdexcept>
 
 #ifdef _WIN32
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
 #elif defined(__linux__)
     #include <chrono>

src/openrct2/core/Guard.cpp

@@ -8,7 +8,9 @@
  *****************************************************************************/
 
 #ifdef _WIN32
-    #include <cassert>
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
 #endif
 

src/openrct2/core/Http.WinHttp.cpp

@@ -17,6 +17,10 @@
 
     #include <cstdio>
     #include <stdexcept>
+
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
     #include <winhttp.h>
 

src/openrct2/core/String.cpp

@@ -27,6 +27,9 @@
     #include <unicode/unistr.h>
     #include <unicode/utypes.h>
 #else
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     #include <windows.h>
 #endif
 

src/openrct2/network/Socket.cpp

@@ -26,6 +26,9 @@
 #ifdef _WIN32
     #pragma comment(lib, "Ws2_32.lib")
 
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
     // winsock2 must be included before windows.h
     #include <winsock2.h>
     #include <ws2tcpip.h>

src/openrct2/platform/Platform.Win32.cpp

@@ -13,27 +13,27 @@
     #ifndef WIN32_LEAN_AND_MEAN
         #define WIN32_LEAN_AND_MEAN
     #endif
-    #include "../Diagnostic.h"
-
-    #include <cassert>
+// clang-format off
     #include <windows.h>
-
-    // Then the rest
-    #include "../Version.h"
-
     #include <datetimeapi.h>
     #include <lmcons.h>
     #include <memory>
     #include <shlobj.h>
+    // clang-format on
     #undef GetEnvironmentVariable
+    #undef small
+
+    #include "Platform.h"
 
     #include "../Date.h"
+    #include "../Diagnostic.h"
     #include "../OpenRCT2.h"
+    #include "../Version.h"
     #include "../core/Path.hpp"
     #include "../core/String.hpp"
     #include "../localisation/Language.h"
-    #include "Platform.h"
 
+    #include <cassert>
     #include <cstring>
     #include <format>
     #include <iterator>