diff --git a/DDrawCompat/Common/Hook.cpp b/DDrawCompat/Common/Hook.cpp
index 99fa430..718832d 100644
--- a/DDrawCompat/Common/Hook.cpp
+++ b/DDrawCompat/Common/Hook.cpp
@@ -1,5 +1,3 @@
-#define WIN32_LEAN_AND_MEAN
-
 #include <algorithm>
 #include <filesystem>
 #include <list>
diff --git a/DDrawCompat/Common/Hook.h b/DDrawCompat/Common/Hook.h
index fd21186..e37406e 100644
--- a/DDrawCompat/Common/Hook.h
+++ b/DDrawCompat/Common/Hook.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 #define CALL_ORIG_FUNC(func) Compat::getOrigFuncPtr<decltype(&func), &func>()
diff --git a/DDrawCompat/Common/ScopedCriticalSection.h b/DDrawCompat/Common/ScopedCriticalSection.h
index 2de93f9..522ddc6 100644
--- a/DDrawCompat/Common/ScopedCriticalSection.h
+++ b/DDrawCompat/Common/ScopedCriticalSection.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Compat
diff --git a/DDrawCompat/Common/Time.h b/DDrawCompat/Common/Time.h
index 5aac53e..56098ed 100644
--- a/DDrawCompat/Common/Time.h
+++ b/DDrawCompat/Common/Time.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Time
diff --git a/DDrawCompat/D3dDdi/Device.cpp b/DDrawCompat/D3dDdi/Device.cpp
index 1c20f7c..5ec9097 100644
--- a/DDrawCompat/D3dDdi/Device.cpp
+++ b/DDrawCompat/D3dDdi/Device.cpp
@@ -1,4 +1,5 @@
 #include <d3d.h>
+#include <winternl.h>
 #include <../km/d3dkmthk.h>
 
 #include "Common/HResultException.h"
diff --git a/DDrawCompat/D3dDdi/Hooks.cpp b/DDrawCompat/D3dDdi/Hooks.cpp
index 2215f12..b8c81c3 100644
--- a/DDrawCompat/D3dDdi/Hooks.cpp
+++ b/DDrawCompat/D3dDdi/Hooks.cpp
@@ -1,8 +1,8 @@
 #include <set>
 
-#include <Windows.h>
 #include <d3d.h>
 #include <d3dumddi.h>
+#include <winternl.h>
 #include <..\km\d3dkmthk.h>
 
 #include "Common/Hook.h"
diff --git a/DDrawCompat/D3dDdi/KernelModeThunks.cpp b/DDrawCompat/D3dDdi/KernelModeThunks.cpp
index 8c787fe..bb99e5f 100644
--- a/DDrawCompat/D3dDdi/KernelModeThunks.cpp
+++ b/DDrawCompat/D3dDdi/KernelModeThunks.cpp
@@ -4,6 +4,7 @@
 
 #include <d3d.h>
 #include <d3dumddi.h>
+#include <winternl.h>
 #include <../km/d3dkmthk.h>
 
 #include "Common/Log.h"
diff --git a/DDrawCompat/D3dDdi/KernelModeThunks.h b/DDrawCompat/D3dDdi/KernelModeThunks.h
index 9687150..6db7bc9 100644
--- a/DDrawCompat/D3dDdi/KernelModeThunks.h
+++ b/DDrawCompat/D3dDdi/KernelModeThunks.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace D3dDdi
diff --git a/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h b/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
index 83d20c8..0fe8264 100644
--- a/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
+++ b/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
@@ -4,6 +4,7 @@
 
 #include <d3d.h>
 #include <d3dumddi.h>
+#include <winternl.h>
 #include <../km/d3dkmthk.h>
 
 std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONINFO& data);
diff --git a/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h b/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
index 91b653b..9cab1e6 100644
--- a/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
+++ b/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
@@ -4,6 +4,7 @@
 
 #include <d3d.h>
 #include <d3dumddi.h>
+#include <winternl.h>
 #include <../km/d3dkmthk.h>
 
 std::ostream& operator<<(std::ostream& os, const LUID& luid);
diff --git a/DDrawCompat/DDraw/ActivateAppHandler.h b/DDrawCompat/DDraw/ActivateAppHandler.h
index df0ce9f..9220c7a 100644
--- a/DDrawCompat/DDraw/ActivateAppHandler.h
+++ b/DDrawCompat/DDraw/ActivateAppHandler.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace DDraw
diff --git a/DDrawCompat/DDraw/Blitter.h b/DDrawCompat/DDraw/Blitter.h
index 9e4edff..4a2307f 100644
--- a/DDrawCompat/DDraw/Blitter.h
+++ b/DDrawCompat/DDraw/Blitter.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace DDraw
diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj
index a205724..da8e17a 100644
--- a/DDrawCompat/DDrawCompat.vcxproj
+++ b/DDrawCompat/DDrawCompat.vcxproj
@@ -78,7 +78,7 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>DEBUGLOGS;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUGLOGS;WIN32_LEAN_AND_MEAN;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -99,7 +99,7 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
@@ -118,7 +118,7 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>DEBUGLOGS;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUGLOGS;WIN32_LEAN_AND_MEAN;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
diff --git a/DDrawCompat/Dll/DllMain.cpp b/DDrawCompat/Dll/DllMain.cpp
index bd4678e..4362b15 100644
--- a/DDrawCompat/Dll/DllMain.cpp
+++ b/DDrawCompat/Dll/DllMain.cpp
@@ -1,5 +1,3 @@
-#define WIN32_LEAN_AND_MEAN
-
 #include <string>
 
 #include <Windows.h>
diff --git a/DDrawCompat/Dll/Procs.h b/DDrawCompat/Dll/Procs.h
index 17fa619..3bdd7d8 100644
--- a/DDrawCompat/Dll/Procs.h
+++ b/DDrawCompat/Dll/Procs.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 #define VISIT_UNMODIFIED_PROCS(visit) \
diff --git a/DDrawCompat/Gdi/Caret.cpp b/DDrawCompat/Gdi/Caret.cpp
index 2bb9e58..91ff5e3 100644
--- a/DDrawCompat/Gdi/Caret.cpp
+++ b/DDrawCompat/Gdi/Caret.cpp
@@ -1,5 +1,3 @@
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 #include "Common/Hook.h"
diff --git a/DDrawCompat/Gdi/Dc.h b/DDrawCompat/Gdi/Dc.h
index 7a82180..87dc1bf 100644
--- a/DDrawCompat/Gdi/Dc.h
+++ b/DDrawCompat/Gdi/Dc.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/DcCache.h b/DDrawCompat/Gdi/DcCache.h
index ac69c0e..aacf699 100644
--- a/DDrawCompat/Gdi/DcCache.h
+++ b/DDrawCompat/Gdi/DcCache.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/DcFunctions.h b/DDrawCompat/Gdi/DcFunctions.h
index a4efb18..2d5623e 100644
--- a/DDrawCompat/Gdi/DcFunctions.h
+++ b/DDrawCompat/Gdi/DcFunctions.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/Gdi.h b/DDrawCompat/Gdi/Gdi.h
index ef4a3bf..c53d678 100644
--- a/DDrawCompat/Gdi/Gdi.h
+++ b/DDrawCompat/Gdi/Gdi.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/Palette.h b/DDrawCompat/Gdi/Palette.h
index 3e8b356..52a2f82 100644
--- a/DDrawCompat/Gdi/Palette.h
+++ b/DDrawCompat/Gdi/Palette.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <vector>
 
 #include <Windows.h>
diff --git a/DDrawCompat/Gdi/Region.h b/DDrawCompat/Gdi/Region.h
index 7eaeb12..8f15ad7 100644
--- a/DDrawCompat/Gdi/Region.h
+++ b/DDrawCompat/Gdi/Region.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/ScrollBar.h b/DDrawCompat/Gdi/ScrollBar.h
index 1838cc6..a1eddc1 100644
--- a/DDrawCompat/Gdi/ScrollBar.h
+++ b/DDrawCompat/Gdi/ScrollBar.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/ScrollFunctions.h b/DDrawCompat/Gdi/ScrollFunctions.h
index b1cbbd9..dc0bc40 100644
--- a/DDrawCompat/Gdi/ScrollFunctions.h
+++ b/DDrawCompat/Gdi/ScrollFunctions.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Gdi
diff --git a/DDrawCompat/Gdi/TitleBar.h b/DDrawCompat/Gdi/TitleBar.h
index aaa7a9d..d2a333b 100644
--- a/DDrawCompat/Gdi/TitleBar.h
+++ b/DDrawCompat/Gdi/TitleBar.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <cstddef>
 
 #include <Windows.h>
diff --git a/DDrawCompat/Gdi/VirtualScreen.h b/DDrawCompat/Gdi/VirtualScreen.h
index dfdfecd..150f402 100644
--- a/DDrawCompat/Gdi/VirtualScreen.h
+++ b/DDrawCompat/Gdi/VirtualScreen.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 #include "Common/CompatPtr.h"
diff --git a/DDrawCompat/Gdi/WinProc.cpp b/DDrawCompat/Gdi/WinProc.cpp
index 0b368e3..f3768e1 100644
--- a/DDrawCompat/Gdi/WinProc.cpp
+++ b/DDrawCompat/Gdi/WinProc.cpp
@@ -1,5 +1,3 @@
-#define WIN32_LEAN_AND_MEAN
-
 #include <map>
 #include <set>
 
diff --git a/DDrawCompat/Gdi/Window.h b/DDrawCompat/Gdi/Window.h
index a857135..d7a4d60 100644
--- a/DDrawCompat/Gdi/Window.h
+++ b/DDrawCompat/Gdi/Window.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <map>
 #include <memory>
 
diff --git a/DDrawCompat/Win32/DisplayMode.h b/DDrawCompat/Win32/DisplayMode.h
index 7fcb1ca..5da13b1 100644
--- a/DDrawCompat/Win32/DisplayMode.h
+++ b/DDrawCompat/Win32/DisplayMode.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Win32
diff --git a/DDrawCompat/Win32/FontSmoothing.cpp b/DDrawCompat/Win32/FontSmoothing.cpp
index 6c489cb..68595a8 100644
--- a/DDrawCompat/Win32/FontSmoothing.cpp
+++ b/DDrawCompat/Win32/FontSmoothing.cpp
@@ -1,5 +1,3 @@
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 #include "Win32/FontSmoothing.h"
diff --git a/DDrawCompat/Win32/FontSmoothing.h b/DDrawCompat/Win32/FontSmoothing.h
index aa9455d..014ea9e 100644
--- a/DDrawCompat/Win32/FontSmoothing.h
+++ b/DDrawCompat/Win32/FontSmoothing.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Win32
diff --git a/DDrawCompat/Win32/MsgHooks.cpp b/DDrawCompat/Win32/MsgHooks.cpp
index 6e1f12e..cfb8210 100644
--- a/DDrawCompat/Win32/MsgHooks.cpp
+++ b/DDrawCompat/Win32/MsgHooks.cpp
@@ -1,5 +1,3 @@
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 #include "Common/Hook.h"
diff --git a/DDrawCompat/Win32/Registry.h b/DDrawCompat/Win32/Registry.h
index 6705b18..da1aba2 100644
--- a/DDrawCompat/Win32/Registry.h
+++ b/DDrawCompat/Win32/Registry.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-
 #include <Windows.h>
 
 namespace Win32