diff --git a/3rdparty/directx-headers/include/directx/d3d12.h b/3rdparty/directx-headers/include/directx/d3d12.h
index c6682d411..66cfa4c4d 100644
--- a/3rdparty/directx-headers/include/directx/d3d12.h
+++ b/3rdparty/directx-headers/include/directx/d3d12.h
@@ -523,7 +523,7 @@ extern "C"{
 /* [local] */ 
 
 #include <winapifamily.h>
-#pragma region App Family
+//#pragma region App Family
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_GAMES)
 #ifndef _D3D12_CONSTANTS
 #define _D3D12_CONSTANTS
@@ -28622,7 +28622,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList8;
 /* [local] */ 
 
 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_GAMES) */
-#pragma endregion
+//#pragma endregion
 DEFINE_GUID(IID_ID3D12Object,0xc4fec28f,0x7966,0x4e95,0x9f,0x94,0xf4,0x31,0xcb,0x56,0xc3,0xb8);
 DEFINE_GUID(IID_ID3D12DeviceChild,0x905db94b,0xa00c,0x4140,0x9d,0xf5,0x2b,0x64,0xca,0x9e,0xa3,0x57);
 DEFINE_GUID(IID_ID3D12RootSignature,0xc54a6b66,0x72df,0x4ee8,0x8b,0xe5,0xa9,0x46,0xa1,0x42,0x92,0x14);
diff --git a/3rdparty/directx-headers/include/directx/d3d12sdklayers.h b/3rdparty/directx-headers/include/directx/d3d12sdklayers.h
index b25a8f6e5..8de3ef13a 100644
--- a/3rdparty/directx-headers/include/directx/d3d12sdklayers.h
+++ b/3rdparty/directx-headers/include/directx/d3d12sdklayers.h
@@ -199,7 +199,7 @@ extern "C"{
 /* [local] */ 
 
 #include <winapifamily.h>
-#pragma region App Family
+//#pragma region App Family
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_GAMES)
 
 
@@ -4072,7 +4072,7 @@ EXTERN_C const IID IID_ID3D12InfoQueue1;
 /* [local] */ 
 
 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_GAMES) */
-#pragma endregion
+//#pragma endregion
 DEFINE_GUID(IID_ID3D12Debug,0x344488b7,0x6846,0x474b,0xb9,0x89,0xf0,0x27,0x44,0x82,0x45,0xe0);
 DEFINE_GUID(IID_ID3D12Debug1,0xaffaa4ca,0x63fe,0x4d8e,0xb8,0xad,0x15,0x90,0x00,0xaf,0x43,0x04);
 DEFINE_GUID(IID_ID3D12Debug2,0x93a665c4,0xa3b2,0x4e5d,0xb6,0x92,0xa2,0x6a,0xe1,0x4e,0x33,0x74);
diff --git a/3rdparty/directx-headers/include/directx/dxgi.h b/3rdparty/directx-headers/include/directx/dxgi.h
index 58c9ffac5..39df33170 100644
--- a/3rdparty/directx-headers/include/directx/dxgi.h
+++ b/3rdparty/directx-headers/include/directx/dxgi.h
@@ -206,7 +206,7 @@ typedef struct DXGI_ADAPTER_DESC
     LUID AdapterLuid;
     } 	DXGI_ADAPTER_DESC;
 
-#if !defined(HMONITOR_DECLARED) && !defined(HMONITOR) && (WINVER < 0x0500)
+#if !defined(HMONITOR_DECLARED) && !defined(HMONITOR) && (!defined(WINVER) || WINVER < 0x0500)
 #define HMONITOR_DECLARED
 #if 0
 typedef HANDLE HMONITOR;
diff --git a/3rdparty/directx-headers/include/wsl/stubs/rpcndr.h b/3rdparty/directx-headers/include/wsl/stubs/rpcndr.h
index 68aa3909d..2d4ba600d 100644
--- a/3rdparty/directx-headers/include/wsl/stubs/rpcndr.h
+++ b/3rdparty/directx-headers/include/wsl/stubs/rpcndr.h
@@ -14,6 +14,10 @@
 #define CONST_VTBL
 #endif
 
+#ifndef __cpp_inline_variables
+#define __cpp_inline_variables 0
+#endif
+
 /* Macros for __uuidof template-based emulation */
 #if defined(__cplusplus)
 #if __cpp_constexpr >= 200704l && __cpp_inline_variables >= 201606L
diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
index 97207d7fa..d2f0f9026 100644
--- a/src/renderer_d3d12.cpp
+++ b/src/renderer_d3d12.cpp
@@ -3932,7 +3932,9 @@ namespace bgfx { namespace d3d12
 	bool CommandQueueD3D12::consume(uint32_t _ms)
 	{
 		CommandList& commandList = m_commandList[m_control.m_read];
-#if !BX_PLATFORM_LINUX
+#if BX_PLATFORM_LINUX
+		BX_UNUSED(commandList, _ms);
+#else
 		if (WAIT_OBJECT_0 == WaitForSingleObject(commandList.m_event, _ms) )
 		{
 			CloseHandle(commandList.m_event);
@@ -5446,7 +5448,7 @@ namespace bgfx { namespace d3d12
 
 	void FrameBufferD3D12::create(uint16_t _denseIdx, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _format, TextureFormat::Enum _depthFormat)
 	{
-		BX_UNUSED(_nwh, _width, _height, _depthFormat);
+		BX_UNUSED(_nwh, _width, _height, _format, _depthFormat);
 
 #if BX_PLATFORM_WINDOWS
 		SwapChainDesc scd;