diff --git a/bgfx b/bgfx
index 9ca7782..011ede6 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit 9ca7782405427306ed33d665f1583199b45699a4
+Subproject commit 011ede6b42a0e1faa9c9bf71a366e6a01836dcc6
diff --git a/bx b/bx
index d8d7d13..36ad613 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit d8d7d13c8571f384aa2fa13b97e933a080835c02
+Subproject commit 36ad6131f4d292f62db64236d1d7f9f70eb26b13
diff --git a/cmake/bgfx/3rdparty/spirv-opt.cmake b/cmake/bgfx/3rdparty/spirv-opt.cmake
index 873fda1..149fac0 100644
--- a/cmake/bgfx/3rdparty/spirv-opt.cmake
+++ b/cmake/bgfx/3rdparty/spirv-opt.cmake
@@ -114,6 +114,7 @@ file(
 	${SPIRV_TOOLS}/source/val/validate_extensions.cpp
 	${SPIRV_TOOLS}/source/val/validate_function.cpp
 	${SPIRV_TOOLS}/source/val/validate_graph.cpp
+	${SPIRV_TOOLS}/source/val/validate_group.cpp
 	${SPIRV_TOOLS}/source/val/validate_id.cpp
 	${SPIRV_TOOLS}/source/val/validate_image.cpp
 	${SPIRV_TOOLS}/source/val/validate_instruction.cpp
diff --git a/cmake/bgfx/shaderc.cmake b/cmake/bgfx/shaderc.cmake
index fdd67db..77e954e 100644
--- a/cmake/bgfx/shaderc.cmake
+++ b/cmake/bgfx/shaderc.cmake
@@ -38,6 +38,20 @@ target_include_directories(
 	PRIVATE ${BGFX_DIR}/3rdparty/dawn
 			${BGFX_DIR}/3rdparty/dawn/src
 )
+
+if(UNIX
+   AND NOT APPLE
+   AND NOT EMSCRIPTEN
+   AND NOT ANDROID
+)
+	target_include_directories(
+		shaderc
+		PRIVATE ${BGFX_DIR}/3rdparty/directx-headers/include/directx
+				${BGFX_DIR}/3rdparty/directx-headers/include
+				${BGFX_DIR}/3rdparty/directx-headers/include/wsl/stubs
+	)
+endif()
+
 if(BGFX_AMALGAMATED)
 	target_link_libraries(shaderc PRIVATE bgfx-shader)
 endif()