diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
index 5a98a5fd76f..810f8a878fe 100644
--- a/cmake/dependencies/common.cmake
+++ b/cmake/dependencies/common.cmake
@@ -30,7 +30,7 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES)
         set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 X11)
     endif()
     set(FFMPEG_PREPARED_BINARIES
-            "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+            "${CMAKE_SOURCE_DIR}/third-party/build-deps/dist/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 
     # check if the directory exists
     if(NOT EXISTS "${FFMPEG_PREPARED_BINARIES}")
diff --git a/docs/Doxyfile b/docs/Doxyfile
index 6526b8bf3cb..b667429d1c3 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME = Sunshine
 # project specific settings
 DOT_GRAPH_MAX_NODES = 60
 IMAGE_PATH = ../docs/images
-INCLUDE_PATH = ../third-party/build-deps/ffmpeg/Linux-x86_64/include/
+INCLUDE_PATH = ../third-party/build-deps/dist/Linux-x86_64/include/
 PREDEFINED += SUNSHINE_BUILD_WAYLAND
 PREDEFINED += SUNSHINE_TRAY=1
 
diff --git a/src/cbs.cpp b/src/cbs.cpp
index 211541d0cc6..0b795a55f53 100644
--- a/src/cbs.cpp
+++ b/src/cbs.cpp
@@ -3,10 +3,10 @@
  * @brief Definitions for FFmpeg Coded Bitstream API.
  */
 extern "C" {
-#include <cbs/cbs_h264.h>
-#include <cbs/cbs_h265.h>
-#include <cbs/h264_levels.h>
 #include <libavcodec/avcodec.h>
+#include <libavcodec/cbs_h264.h>
+#include <libavcodec/cbs_h265.h>
+#include <libavcodec/h264_levels.h>
 #include <libavutil/pixdesc.h>
 }
 
diff --git a/third-party/build-deps b/third-party/build-deps
index f8a2a1128ee..ccac36854da 160000
--- a/third-party/build-deps
+++ b/third-party/build-deps
@@ -1 +1 @@
-Subproject commit f8a2a1128eeeae2ca2ed64fd64604a529e24a682
+Subproject commit ccac36854da7697ee3beae0c1d46bb1137403b2e