diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f1e8ae5..0498e195 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,10 +9,7 @@ on:
     - cron: 1 12 * * 1
 
 env:
-  WIN_LIBUSB_INC: -DLIBUSB_INCLUDE_DIR=C:/vcpkg/installed/x64-windows/include/libusb-1.0
-  WIN_LIBUSB_LIB: -DLIBUSB_LIBRARIES=C:/vcpkg/installed/x64-windows/lib/libusb-1.0.lib
-  WIN_FFTW_INC: -DFFTW3f_INCLUDE_DIRS=C:/vcpkg/installed/x64-windows/include
-  WIN_FFTW_LIB: -DFFTW3f_LIBRARIES=C:/vcpkg/installed/x64-windows/lib/fftw3f.lib
+  WIN_PKG_CONFIG: -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
   WIN_CMAKE_TOOLCHAIN: -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
 
   # Override OSX architecture detection. Required for CMake versions < 3.19.2.
@@ -54,7 +51,7 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
 
     - name: Install dependencies (Windows)
-      run: vcpkg install --triplet=x64-windows libusb fftw3 pthreads
+      run: vcpkg install --triplet=x64-windows libusb fftw3 pthreads pkgconf
       if: matrix.os == 'windows-latest'
 
     # Build libhackrf and hackrf-tools together
@@ -68,7 +65,7 @@ jobs:
 
     - name: Configure CMake (Windows)
       working-directory: ${{github.workspace}}/host/build
-      run: cmake $env:GITHUB_WORKSPACE/host/ $env:WIN_LIBUSB_INC $env:WIN_LIBUSB_LIB $env:WIN_FFTW_INC $env:WIN_FFTW_LIB $env:WIN_CMAKE_TOOLCHAIN
+      run: cmake $env:GITHUB_WORKSPACE/host/ $env:WIN_PKG_CONFIG $env:WIN_CMAKE_TOOLCHAIN
       if: matrix.os == 'windows-latest'
 
     - name: Build
@@ -86,7 +83,7 @@ jobs:
 
     - name: Configure CMake (libhackrf, Windows)
       working-directory: ${{github.workspace}}/host/libhackrf/build
-      run: cmake $env:GITHUB_WORKSPACE/host/libhackrf/ $env:WIN_LIBUSB_INC $env:WIN_LIBUSB_LIB $env:WIN_CMAKE_TOOLCHAIN
+      run: cmake $env:GITHUB_WORKSPACE/host/libhackrf/ $env:WIN_PKG_CONFIG $env:WIN_CMAKE_TOOLCHAIN
       if: matrix.os == 'windows-latest'
 
     - name: Build (libhackrf)
@@ -122,7 +119,7 @@ jobs:
     - name: Configure CMake (hackrf-tools, Windows)
       working-directory: ${{github.workspace}}/host/hackrf-tools/build
       run: |
-        cmake $env:GITHUB_WORKSPACE/host/hackrf-tools/ $env:WIN_FFTW_INC $env:WIN_FFTW_LIB -DLIBHACKRF_INCLUDE_DIR="$env:GITHUB_WORKSPACE/install/include/libhackrf" -DLIBHACKRF_LIBRARIES="$env:GITHUB_WORKSPACE/install/bin/hackrf.lib" $env:WIN_CMAKE_TOOLCHAIN
+        cmake $env:GITHUB_WORKSPACE/host/hackrf-tools/ -DLIBHACKRF_INCLUDE_DIR="$env:GITHUB_WORKSPACE/install/include/libhackrf" -DLIBHACKRF_LIBRARIES="$env:GITHUB_WORKSPACE/install/bin/hackrf.lib" $env:WIN_PKG_CONFIG $env:WIN_CMAKE_TOOLCHAIN
       if: matrix.os == 'windows-latest'
 
     - name: Build (hackrf-tools)
diff --git a/host/cmake/modules/FindLIBUSB.cmake b/host/cmake/modules/FindLIBUSB.cmake
index 1509e19c..c5686e04 100644
--- a/host/cmake/modules/FindLIBUSB.cmake
+++ b/host/cmake/modules/FindLIBUSB.cmake
@@ -19,16 +19,14 @@ if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
   set(LIBUSB_FOUND TRUE)
 
 else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-  if(NOT WIN32)
-    # use pkg-config to get the directories and then use these values in the
-    # FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_LIBUSB libusb-1.0)
-  endif(NOT WIN32)
+  # use pkg-config to get the directories and then use these values in the
+  # FIND_PATH() and FIND_LIBRARY() calls
+  find_package(PkgConfig)
+  pkg_check_modules(PC_LIBUSB libusb-1.0)
 
-  set(LIBUSB_LIBRARY_NAME usb-1.0)
+  set(LIBUSB_LIBRARY_NAMES usb-1.0)
   if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    set(LIBUSB_LIBRARY_NAME usb)
+    set(LIBUSB_LIBRARY_NAMES usb)
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     # vcpkg's libusb-1.0 has a "lib" prefix, but on Windows MVSC, CMake doesn't
     # search for static libraries with lib prefixes automatically.
@@ -40,7 +38,7 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
 
   find_library(
     LIBUSB_LIBRARIES
-    NAMES ${LIBUSB_LIBRARY_NAME}
+    NAMES ${LIBUSB_LIBRARY_NAMES}
     PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
 
 endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)