diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index a216bb636e..05b36f12aa 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -29,7 +29,6 @@
 #include "Common/CommonWindows.h"
 #include "Common/StringUtils.h"
 
-#include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
 
diff --git a/Windows/Debugger/Debugger_Lists.cpp b/Windows/Debugger/Debugger_Lists.cpp
index 4cc774a2f5..8e65ea2770 100644
--- a/Windows/Debugger/Debugger_Lists.cpp
+++ b/Windows/Debugger/Debugger_Lists.cpp
@@ -1,7 +1,6 @@
 #include "Windows/Debugger/Debugger_Lists.h"
 #include "Common/CommonWindows.h"
 #include <windowsx.h>
-#include <windows.h>
 #include <commctrl.h>
 #include "Windows/Debugger/BreakpointWindow.h"
 #include "Windows/Debugger/CtrlDisAsmView.h"
diff --git a/Windows/Debugger/Debugger_MemoryDlg.cpp b/Windows/Debugger/Debugger_MemoryDlg.cpp
index 590f749f8f..b247459bbf 100644
--- a/Windows/Debugger/Debugger_MemoryDlg.cpp
+++ b/Windows/Debugger/Debugger_MemoryDlg.cpp
@@ -1,6 +1,5 @@
 #include "Windows/stdafx.h"
 #include <windowsx.h>
-#include <windows.h>
 #include <commctrl.h>
 #include "..\resource.h"
 
diff --git a/Windows/Debugger/Debugger_VFPUDlg.cpp b/Windows/Debugger/Debugger_VFPUDlg.cpp
index 224477d3ac..a82f0793e7 100644
--- a/Windows/Debugger/Debugger_VFPUDlg.cpp
+++ b/Windows/Debugger/Debugger_VFPUDlg.cpp
@@ -1,6 +1,5 @@
 #include "Common/CommonWindows.h"
 #include <windowsx.h>
-#include <windows.h>
 #include <commctrl.h>
 #include "Windows/resource.h"
 #include "Common/Data/Encoding/Utf8.h"
diff --git a/Windows/GEDebugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp
index f704b3e6a4..c96643cc38 100644
--- a/Windows/GEDebugger/GEDebugger.cpp
+++ b/Windows/GEDebugger/GEDebugger.cpp
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include "Common/CommonWindows.h"
-#include <windows.h>
 #include <commctrl.h>
 
 #include "Common/Data/Convert/ColorConv.h"
diff --git a/Windows/GEDebugger/TabDisplayLists.cpp b/Windows/GEDebugger/TabDisplayLists.cpp
index 7c6de9f0e0..2b29a91d36 100644
--- a/Windows/GEDebugger/TabDisplayLists.cpp
+++ b/Windows/GEDebugger/TabDisplayLists.cpp
@@ -8,7 +8,6 @@
 #include "GPU/GPUState.h"
 #include "Core/Config.h"
 #include <windowsx.h>
-#include <windows.h>
 #include <commctrl.h>
 
 enum { WM_GEDBG_LISTS_CHANGELIST = WM_USER+400, WM_GEDBG_LISTS_GOTOSTACKPC };
diff --git a/Windows/GEDebugger/TabState.cpp b/Windows/GEDebugger/TabState.cpp
index 69fb02ea8e..5719d2a347 100644
--- a/Windows/GEDebugger/TabState.cpp
+++ b/Windows/GEDebugger/TabState.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <commctrl.h>
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
diff --git a/Windows/GEDebugger/TabVertices.cpp b/Windows/GEDebugger/TabVertices.cpp
index 19d900e9e2..4304084a4d 100644
--- a/Windows/GEDebugger/TabVertices.cpp
+++ b/Windows/GEDebugger/TabVertices.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <commctrl.h>
 #include "Common/CommonTypes.h"
 #include "Common/Data/Encoding/Utf8.h"
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index 47752342e0..fbba1e23cf 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -27,7 +27,6 @@
 
 #include <Windowsx.h>
 #include <shellapi.h>
-#include <windows.h>
 #include <commctrl.h>
 #include <string>
 
diff --git a/Windows/W32Util/DarkMode.h b/Windows/W32Util/DarkMode.h
index 81d5037a1a..0ad97a8771 100644
--- a/Windows/W32Util/DarkMode.h
+++ b/Windows/W32Util/DarkMode.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <Windows.h>
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <commctrl.h>
 #include <Uxtheme.h>
 #include <WindowsX.h>
diff --git a/Windows/W32Util/IatHook.h b/Windows/W32Util/IatHook.h
index edfedbe68c..2319e3ceac 100644
--- a/Windows/W32Util/IatHook.h
+++ b/Windows/W32Util/IatHook.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
+#include "Common/CommonWindows.h"
 #include <cstdint>
-#include <windows.h>
 #include <winnt.h>
 
 template <typename T, typename T1, typename T2>
diff --git a/Windows/W32Util/Misc.cpp b/Windows/W32Util/Misc.cpp
index 7a731ecd8e..97f4e475e5 100644
--- a/Windows/W32Util/Misc.cpp
+++ b/Windows/W32Util/Misc.cpp
@@ -3,7 +3,6 @@
 
 #include <WinUser.h>
 #include <shellapi.h>
-#include <windows.h>
 #include <commctrl.h>
 
 #include "Misc.h"
diff --git a/Windows/W32Util/TabControl.cpp b/Windows/W32Util/TabControl.cpp
index bca564267f..d4556725b6 100644
--- a/Windows/W32Util/TabControl.cpp
+++ b/Windows/W32Util/TabControl.cpp
@@ -2,7 +2,6 @@
 #include "DialogManager.h"
 #include "Windows/MainWindow.h"
 #include <windowsx.h>
-#include <windows.h>
 #include <commctrl.h>
 
 const DWORD tabControlStyleMask = ~(WS_POPUP | WS_TILEDWINDOW);