diff --git a/CMakeLists.txt b/CMakeLists.txt
index c472983c..4c8cdcaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ if(WIN32)
 		QOS_NON_ADAPTIVE_FLOW=2)
 endif()
 add_subdirectory(third-party/moonlight-common-c/enet)
-add_subdirectory(third-party/cbs)
 
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
@@ -137,6 +136,8 @@ else()
 	configure_file(sunshine.service.in sunshine.service @ONLY)
 endif()
 
+add_subdirectory(third-party/cbs)
+
 set(Boost_USE_STATIC_LIBS ON)
 find_package(Boost COMPONENTS log filesystem REQUIRED)
 
diff --git a/appveyor.yml b/appveyor.yml
index 3f78f578..d737446a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ environment:
 install:
   - sh: sudo apt update --ignore-missing
   - sh: sudo apt install -y build-essential fakeroot gcc-10 g++-10 cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
-  - cmd: C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make"
+  - cmd: C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make"
 
 before_build:
   - git submodule update --init --recursive
diff --git a/third-party/cbs/CMakeLists.txt b/third-party/cbs/CMakeLists.txt
index 2574d06e..0684bd60 100644
--- a/third-party/cbs/CMakeLists.txt
+++ b/third-party/cbs/CMakeLists.txt
@@ -55,6 +55,10 @@ ${ARCH_SOURCE_FILES}
 
 include_directories(include)
 
+if(DEFINED SUNSHINE_PREPARED_BINARIES)
+include_directories(${SUNSHINE_PREPARED_BINARIES}/include)
+endif()
+
 add_compile_definitions(
     ARCH_X86=1
     ARCH_X86_64=1
@@ -79,4 +83,4 @@ add_compile_definitions(
 
 
 add_library(cbs ${CBS_SOURCE_FILES})
-target_compile_options(cbs PRIVATE -Wall -Wno-incompatible-pointer-types)
\ No newline at end of file
+target_compile_options(cbs PRIVATE -Wall -Wno-incompatible-pointer-types -Wno-maybe-uninitialized -Wno-format -Wno-format-extra-args)
\ No newline at end of file