diff --git a/.gitignore b/.gitignore
index fc9250e505..b76a549eed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,9 @@
 # ignore gradle build folder
 build/
 
+# created by clangd for index cache
+.cache/
+
 # direnv has been claimed for Nix usage
 .direnv/
 .devenv
diff --git a/bindings-provider/fmt.ps1 b/bindings-provider/fmt.ps1
new file mode 100755
index 0000000000..ca60910f44
--- /dev/null
+++ b/bindings-provider/fmt.ps1
@@ -0,0 +1,12 @@
+$ErrorActionPreference = "Stop"
+
+if ((Get-Command "clang-format" -ErrorAction SilentlyContinue) -eq $null) {
+    $errorObj = New-Object System.IO.FileNotFoundException("clang-format is not installed, please install clang-format via your package manager (e.g. winget/chocolatey/scoop) and re-run the script")
+    throw $errorObj
+}
+
+$SourceFiles = Get-ChildItem -Path '.\src\' -Recurse -Include "*.cpp","*.hpp"
+foreach ($file in $SourceFiles) {
+    Write-Output "Formatting $(Resolve-Path -Relative $file.FullName)"
+    clang-format -i "$($file.FullName)"
+}
diff --git a/bindings-provider/fmt.sh b/bindings-provider/fmt.sh
new file mode 100755
index 0000000000..7a820193b3
--- /dev/null
+++ b/bindings-provider/fmt.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+if ! command -v clang-format >/dev/null 2>&1; then
+  echo "clang-format is not installed, please install clang-format via your package manager (e.g. pacman/apt/dnf/winget) and re-run the script" >&2
+  exit 1
+fi
+
+find src/ \( \
+  -iname '*.cpp' \
+  -or -iname '*.hpp' \
+\) \
+  -exec echo Formatting {} \; \
+  -exec clang-format -i {} \;
diff --git a/bindings-provider/src/main.cpp b/bindings-provider/src/main.cpp
index f699b9307f..2403356c34 100644
--- a/bindings-provider/src/main.cpp
+++ b/bindings-provider/src/main.cpp
@@ -102,19 +102,34 @@ static void signal_handler(int signal) {
 
 int main() {
     auto &logger = Logger::get();
-    // Steam and SteamVR sets these environment variables on applications that it
-    // spawns, but if an app spawned by Steam then spawns a child that initialises
-    // OpenVR, SteamVR will give the child the appkey of the root application it
-    // is a descendant of, e.g. if SteamVR launches SlimeVR as an overlay,
-    // it will set SteamAppId="3245490" and STEAMVR_APPKEY="steam.overlay.3245490"
-    // which breaks our bindings. We want SteamVR to use a generated appkey if
-    // possible.
+
+    // Steam and SteamVR respectively set these environment variables on applications that
+    // they spawn, which the SteamVR client library (vrclient) will then use as the
+    // application key when initiating the connection with vrserver. This may not
+    // be ideal if we are launched by another Steam or OpenVR application, as we will inherit
+    // their app key through the environment, which means SteamVR will load the wrong bindings.
+    // A real-world example of this is if someone uses an application such as OpenVR-Autostarter
+    // to start the SlimeVR Server. OpenVR-Autostarter installs an application manifest with the
+    // app key "dreiekk.openvr-autostarter", so when it starts SlimeVR Server, which then starts us,
+    // the STEAMVR_APPKEY="dreiekk.openvr-autostarter" environment variable will be set.
+    //
+    // We want SteamVR to use the appkey of the Steam version of our application if possible.
+    // Unfortunately, we cannot install an application vrmanifest to force the app key,
+    // as SteamVR requires a binary path in the manifest to consider it valid. We do not want to install
+    // a manifest with a binary path because we want the SlimeVR Server to start us when the
+    // driver initiates a connection, rather than getting auto-started by SteamVR.
+    //
+    // This is not documented anywhere publicly, see CVRClient::SendConnectMessage in vrclient instead.
+
+    constexpr const char *STEAM_APPID = "3245490";
+    constexpr const char *STEAMVR_APPKEY = "steam.overlay.3245490";
+
 #ifdef _WIN32
-    SetEnvironmentVariableA("SteamAppId", nullptr);
-    SetEnvironmentVariableA("STEAMVR_APPKEY", nullptr);
+    SetEnvironmentVariableA("SteamAppId", STEAM_APPID);
+    SetEnvironmentVariableA("STEAMVR_APPKEY", STEAMVR_APPKEY);
 #else
-    unsetenv("SteamAppId");
-    unsetenv("STEAMVR_APPKEY");
+    setenv("SteamAppId", STEAM_APPID, 1);
+    setenv("STEAMVR_APPKEY", STEAMVR_APPKEY, 1);
 #endif
 
     try {