diff --git a/common/RedtapeWindows.h b/common/RedtapeWindows.h
index 3c4c149cfc..8507b73fd6 100644
--- a/common/RedtapeWindows.h
+++ b/common/RedtapeWindows.h
@@ -25,12 +25,11 @@
 #endif
 
 // We require Windows 10+.
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
 #define _WIN32_WINNT 0x0A00 // Windows 10
 
-#include <windows.h>
-#include <versionhelpers.h>
-#include <shtypes.h>
-#include <timeapi.h>
-#include <tchar.h>
+#include <Windows.h>
 
 #endif
diff --git a/common/Windows/WinMisc.cpp b/common/Windows/WinMisc.cpp
index 951fdfd517..adeea44441 100644
--- a/common/Windows/WinMisc.cpp
+++ b/common/Windows/WinMisc.cpp
@@ -25,8 +25,8 @@
 #include "fmt/core.h"
 
 #include <mmsystem.h>
-
-#pragma comment(lib, "User32.lib")
+#include <timeapi.h>
+#include <VersionHelpers.h>
 
 alignas(16) static LARGE_INTEGER lfreq;
 
@@ -67,7 +67,7 @@ std::string GetOSVersionString()
 	if (IsWindows10OrGreater())
 	{
 		retval = "Microsoft ";
-		retval += IsWindowsServer() ? "Windows Server 2016" : "Windows 10";
+		retval += IsWindowsServer() ? "Windows Server 2016+" : "Windows 10+";
 		
 	}
 	else
diff --git a/common/Windows/WinThreads.cpp b/common/Windows/WinThreads.cpp
index e99814b402..89341002ff 100644
--- a/common/Windows/WinThreads.cpp
+++ b/common/Windows/WinThreads.cpp
@@ -19,7 +19,9 @@
 #include "common/Assertions.h"
 #include "common/emitter/tools.h"
 #include "common/RedtapeWindows.h"
+#include <mmsystem.h>
 #include <process.h>
+#include <timeapi.h>
 
 __fi void Threading::Sleep(int ms)
 {
diff --git a/pcsx2/CDVD/CDVDdiscReader.h b/pcsx2/CDVD/CDVDdiscReader.h
index 3a2f596e13..622942b98d 100644
--- a/pcsx2/CDVD/CDVDdiscReader.h
+++ b/pcsx2/CDVD/CDVDdiscReader.h
@@ -15,9 +15,8 @@
 
 #pragma once
 
-#if defined(_WIN32)
-#define NOMINMAX
-#include <windows.h>
+#ifdef _WIN32
+#include "common/RedtapeWindows.h"
 #endif
 
 #include <mutex>
diff --git a/pcsx2/DEV9/DEV9.cpp b/pcsx2/DEV9/DEV9.cpp
index 2113c83461..63522df8ee 100644
--- a/pcsx2/DEV9/DEV9.cpp
+++ b/pcsx2/DEV9/DEV9.cpp
@@ -21,8 +21,7 @@
 
 #ifdef _WIN32
 #include "common/RedtapeWindows.h"
-#include <Winioctl.h>
-#include <windows.h>
+#include <winioctl.h>
 #else
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/pcsx2/DEV9/DEV9.h b/pcsx2/DEV9/DEV9.h
index c9ab328c9f..4102f05beb 100644
--- a/pcsx2/DEV9/DEV9.h
+++ b/pcsx2/DEV9/DEV9.h
@@ -31,7 +31,7 @@
 #ifdef _WIN32
 
 #define usleep(x) Sleep(x / 1000)
-#include <windows.h>
+#include "common/RedtapeWindows.h"
 #include <windowsx.h>
 #include <winioctl.h>
 
diff --git a/pcsx2/DEV9/Win32/tap-win32.cpp b/pcsx2/DEV9/Win32/tap-win32.cpp
index 5e40d6032b..c632aae587 100644
--- a/pcsx2/DEV9/Win32/tap-win32.cpp
+++ b/pcsx2/DEV9/Win32/tap-win32.cpp
@@ -21,9 +21,8 @@
 #include "fmt/core.h"
 
 #include <stdio.h>
-#include <windows.h>
-#include <winsock2.h>
-#include <ws2ipdef.h>
+#include <WinSock2.h>
+#include <WS2tcpip.h>
 #include <iphlpapi.h>
 
 #include <Netcfgx.h>
diff --git a/pcsx2/DEV9/pcap_io.cpp b/pcsx2/DEV9/pcap_io.cpp
index be9cbd2adf..7ee049da0b 100644
--- a/pcsx2/DEV9/pcap_io.cpp
+++ b/pcsx2/DEV9/pcap_io.cpp
@@ -19,12 +19,10 @@
 #include <memory>
 
 #ifdef _WIN32
-#include <winsock2.h>
-#include <windows.h>
-#include <iphlpapi.h>
-//#include <ws2tcpip.h>
-//#include <comdef.h>
+#include "common/RedtapeWindows.h"
 #include "common/StringUtil.h"
+#include <WinSock2.h>
+#include <iphlpapi.h>
 #elif defined(__linux__)
 #include <sys/ioctl.h>
 #include <net/if.h>
diff --git a/pcsx2/Frontend/D3D11HostDisplay.cpp b/pcsx2/Frontend/D3D11HostDisplay.cpp
index 8a295ba5a3..865fae31f7 100644
--- a/pcsx2/Frontend/D3D11HostDisplay.cpp
+++ b/pcsx2/Frontend/D3D11HostDisplay.cpp
@@ -472,26 +472,26 @@ static std::string GetDriverVersionFromLUID(const LUID& luid)
 	std::string ret;
 
 	HKEY hKey;
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\DirectX"), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+	if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectX", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
 	{
 		DWORD max_key_len = 0, adapter_count = 0;
-		if (RegQueryInfoKey(hKey, nullptr, nullptr, nullptr, &adapter_count, &max_key_len,
+		if (RegQueryInfoKeyW(hKey, nullptr, nullptr, nullptr, &adapter_count, &max_key_len,
 				nullptr, nullptr, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
 		{
 			std::vector<TCHAR> current_name(max_key_len + 1);
 			for (DWORD i = 0; i < adapter_count; ++i)
 			{
 				DWORD subKeyLength = static_cast<DWORD>(current_name.size());
-				if (RegEnumKeyEx(hKey, i, current_name.data(), &subKeyLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
+				if (RegEnumKeyExW(hKey, i, current_name.data(), &subKeyLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
 				{
 					LUID current_luid = {};
 					DWORD current_luid_size = sizeof(uint64_t);
-					if (RegGetValue(hKey, current_name.data(), _T("AdapterLuid"), RRF_RT_QWORD, nullptr, &current_luid, &current_luid_size) == ERROR_SUCCESS &&
+					if (RegGetValueW(hKey, current_name.data(), L"AdapterLuid", RRF_RT_QWORD, nullptr, &current_luid, &current_luid_size) == ERROR_SUCCESS &&
 						current_luid.HighPart == luid.HighPart && current_luid.LowPart == luid.LowPart)
 					{
 						LARGE_INTEGER driver_version = {};
 						DWORD driver_version_size = sizeof(driver_version);
-						if (RegGetValue(hKey, current_name.data(), _T("DriverVersion"), RRF_RT_QWORD, nullptr, &driver_version, &driver_version_size) == ERROR_SUCCESS)
+						if (RegGetValueW(hKey, current_name.data(), L"DriverVersion", RRF_RT_QWORD, nullptr, &driver_version, &driver_version_size) == ERROR_SUCCESS)
 						{
 							WORD nProduct = HIWORD(driver_version.HighPart);
 							WORD nVersion = LOWORD(driver_version.HighPart);
diff --git a/pcsx2/Frontend/D3D12HostDisplay.cpp b/pcsx2/Frontend/D3D12HostDisplay.cpp
index e4a0830395..eec5aa02f1 100644
--- a/pcsx2/Frontend/D3D12HostDisplay.cpp
+++ b/pcsx2/Frontend/D3D12HostDisplay.cpp
@@ -348,7 +348,7 @@ static std::string GetDriverVersionFromLUID(const LUID& luid)
 	std::string ret;
 
 	HKEY hKey;
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\DirectX"), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+	if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectX", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
 	{
 		DWORD max_key_len = 0, adapter_count = 0;
 		if (RegQueryInfoKey(hKey, nullptr, nullptr, nullptr, &adapter_count, &max_key_len,
@@ -358,16 +358,16 @@ static std::string GetDriverVersionFromLUID(const LUID& luid)
 			for (DWORD i = 0; i < adapter_count; ++i)
 			{
 				DWORD subKeyLength = static_cast<DWORD>(current_name.size());
-				if (RegEnumKeyEx(hKey, i, current_name.data(), &subKeyLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
+				if (RegEnumKeyExW(hKey, i, current_name.data(), &subKeyLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
 				{
 					LUID current_luid = {};
 					DWORD current_luid_size = sizeof(uint64_t);
-					if (RegGetValue(hKey, current_name.data(), _T("AdapterLuid"), RRF_RT_QWORD, nullptr, &current_luid, &current_luid_size) == ERROR_SUCCESS &&
+					if (RegGetValueW(hKey, current_name.data(), L"AdapterLuid", RRF_RT_QWORD, nullptr, &current_luid, &current_luid_size) == ERROR_SUCCESS &&
 						current_luid.HighPart == luid.HighPart && current_luid.LowPart == luid.LowPart)
 					{
 						LARGE_INTEGER driver_version = {};
 						DWORD driver_version_size = sizeof(driver_version);
-						if (RegGetValue(hKey, current_name.data(), _T("DriverVersion"), RRF_RT_QWORD, nullptr, &driver_version, &driver_version_size) == ERROR_SUCCESS)
+						if (RegGetValueW(hKey, current_name.data(), L"DriverVersion", RRF_RT_QWORD, nullptr, &driver_version, &driver_version_size) == ERROR_SUCCESS)
 						{
 							WORD nProduct = HIWORD(driver_version.HighPart);
 							WORD nVersion = LOWORD(driver_version.HighPart);
diff --git a/pcsx2/SPU2/SndOut_Cubeb.cpp b/pcsx2/SPU2/SndOut_Cubeb.cpp
index 1a093b1e32..81bac69967 100644
--- a/pcsx2/SPU2/SndOut_Cubeb.cpp
+++ b/pcsx2/SPU2/SndOut_Cubeb.cpp
@@ -15,13 +15,18 @@
 
 #include "PrecompiledHeader.h"
 
+#include "Global.h"
+#include "SndOut.h"
+
 #include "common/Console.h"
 #include "common/StringUtil.h"
 #include "common/RedtapeWindows.h"
+
 #include "cubeb/cubeb.h"
 
-#include "Global.h"
-#include "SndOut.h"
+#ifdef _WIN32
+#include <objbase.h>
+#endif
 
 #ifdef PCSX2_CORE
 
diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp
index b799907eca..6c5b1acf0d 100644
--- a/pcsx2/VMManager.cpp
+++ b/pcsx2/VMManager.cpp
@@ -67,6 +67,8 @@
 
 #ifdef _WIN32
 #include "common/RedtapeWindows.h"
+#include <objbase.h>
+#include <timeapi.h>
 #endif
 
 namespace VMManager