diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92fae0f..5ef0c09 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -160,10 +160,10 @@ jobs:
     needs: [build-pongo, build-ramdisk]
 
     env:
-      LIBUSBK_VERSION: libusbK-3.0.5.16-bin.7z
-      LIBUSBK_URL: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/usb-travis/${{ env.LIBUSBK_VERSION }}
-      LIBUSBK_WDFCOINSTALLER: libusbK/bin/sys/WdfCoInstaller01009.dll
-      LIBUSBK_WDFCOINSTALLER_RENAMED: libusbK/bin/sys/WdfCoInstaller1011.dll
+      LIBUSBK_VERSION: libusbK-3.0.5.16-bin
+      LIBUSBK_URL: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/usb-travis/
+      LIBUSBK_WDFCOINSTALLER: libusbK/bin/sys/amd64/WdfCoInstaller01009.dll
+      LIBUSBK_WDFCOINSTALLER_RENAMED: libusbK/bin/sys/amd64/WdfCoInstaller1011.dll
 
     steps:
     - uses: actions/checkout@v4
@@ -181,11 +181,12 @@ jobs:
         path: payloads/
 
     - name: Download libusbK drivers
+      shell: bash
       run: |
-        curl -LO $LIBUSBK_URL
-        7z x $LIBUSBK_VERSION -olibusbK
-        # libwdi doesn't like "9"s in the filename lol
-        mv $LIBUSBK_WDFCOINSTALLER $LIBUSBK_WDFCOINSTALLER_RENAMED
+        curl -LO "${LIBUSBK_URL}${LIBUSBK_VERSION}.7z"
+        7z x "${LIBUSBK_VERSION}.7z" -olibusbK-tmp
+        mv "libusbK-tmp/${LIBUSBK_VERSION}" libusbK
+        mv "${LIBUSBK_WDFCOINSTALLER}" "${LIBUSBK_WDFCOINSTALLER_RENAMED}"
 
     - name: Set up MSYS2
       uses: msys2/setup-msys2@v2
diff --git a/.gitignore b/.gitignore
index 3b164ff..60c5783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
 build/
 .DS_Store
+
 src/gen/
 payloads/Pongo.bin
 payloads/checkra1n-kpf-pongo
 payloads/ramdisk.dmg
 payloads/binpack.dmg
-libusbK/
\ No newline at end of file
+
+libusbK/
+libusbK-tmp/
+*.7z
\ No newline at end of file
diff --git a/src/m8/run.c b/src/m8/run.c
index 45b91ab..3d7ee99 100644
--- a/src/m8/run.c
+++ b/src/m8/run.c
@@ -11,7 +11,6 @@
 #include "../utils.h"
 #include "../usb/shim.h"
 #include "../usb/pongo_helper.h"
-#include "../usb/driver/driver.h"
 
 #include "checkm8.h"
 #include "dfu.h"