diff --git a/.cruft.json b/.cruft.json
index 4b26982..612291b 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "git@github.com:bl-sdk/common_dotfiles.git",
-  "commit": "597ec422d3b5692927f325b9b5c2ae42288e8cc5",
+  "commit": "91563903c1b88e5cc2363d448e62180fdb318382",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -15,7 +15,8 @@
       "__project_slug": "pluginloader",
       "include_cpp": true,
       "include_py": false,
-      "_template": "git@github.com:bl-sdk/common_dotfiles.git"
+      "_template": "git@github.com:bl-sdk/common_dotfiles.git",
+      "_commit": "91563903c1b88e5cc2363d448e62180fdb318382"
     }
   },
   "directory": null
diff --git a/.gitignore b/.gitignore
index 50e5591..c90289d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .vs
 .vscode
 .idea
+.nvim.lua
 
 # C/C++ excludes
 .cache/clangd
diff --git a/CMakePresets.json b/CMakePresets.json
index 5ee05a9..1b83a48 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 3,
   "configurePresets": [
     {
diff --git a/common_cmake b/common_cmake
index 0b1c32d..17528aa 160000
--- a/common_cmake
+++ b/common_cmake
@@ -1 +1 @@
-Subproject commit 0b1c32de1ff98a7851f798d6b092edd1e89e5eba
+Subproject commit 17528aa7461deea26f55b2d7dc9ede720feee4c3
diff --git a/src/console.cpp b/src/console.cpp
index 01d2f79..6237e1c 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -16,9 +16,11 @@ void create_if_needed(void) {
     SetConsoleTitleA("Plugin Loader Debug Console");
 
     // All of this is necessary so that way we can properly use the output of the console
+    // NOLINTBEGIN(misc-const-correctness) - clang tidy 21.1.x false positive
     FILE* new_stdin = nullptr;
     FILE* new_stdout = nullptr;
     FILE* new_stderr = nullptr;
+    // NOLINTEND(misc-const-correctness)
     freopen_s(&new_stdin, "CONIN$", "r", stdin);
     freopen_s(&new_stdout, "CONOUT$", "w", stdout);
     freopen_s(&new_stderr, "CONOUT$", "w", stderr);
diff --git a/src/proxy/d3d11.cpp b/src/proxy/d3d11.cpp
index ffc5f6b..a838e46 100644
--- a/src/proxy/d3d11.cpp
+++ b/src/proxy/d3d11.cpp
@@ -20,11 +20,11 @@ FARPROC d3d11_on_12_create_device_ptr = nullptr;
 
 // NOLINTBEGIN(readability-identifier-naming, readability-identifier-length)
 
-#if defined(__MINGW32__)
+#ifdef __MINGW32__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
-#if defined(__clang__)
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
 #endif
@@ -85,10 +85,10 @@ DLL_EXPORT HRESULT D3D11On12CreateDevice(void* pDevice,
         ppDevice, ppImmediateContext, pChosenFeatureLevel);
 }
 
-#if defined(__clang__)
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#if defined(__MINGW32__)
+#ifdef __MINGW32__
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/proxy/dsound.cpp b/src/proxy/dsound.cpp
index f61c7c2..a14a21d 100644
--- a/src/proxy/dsound.cpp
+++ b/src/proxy/dsound.cpp
@@ -26,11 +26,11 @@ FARPROC direct_sound_capture_create_8_ptr = nullptr;
 
 // NOLINTBEGIN(readability-identifier-naming)
 
-#if defined(__MINGW32__)
+#ifdef __MINGW32__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
-#if defined(__clang__)
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
 #endif
@@ -110,10 +110,10 @@ DLL_EXPORT HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID pcGuidDevice,
         direct_sound_capture_create_8_ptr)(pcGuidDevice, ppDSC8, pUnkOuter);
 }
 
-#if defined(__clang__)
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#if defined(__MINGW32__)
+#ifdef __MINGW32__
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/proxy/xinput1_3.cpp b/src/proxy/xinput1_3.cpp
index 05b0194..1bd9bfe 100644
--- a/src/proxy/xinput1_3.cpp
+++ b/src/proxy/xinput1_3.cpp
@@ -30,11 +30,11 @@ FARPROC xinput_power_off_controller_ptr = nullptr;
 
 // NOLINTBEGIN(readability-identifier-naming)
 
-#if defined(__MINGW32__)
+#ifdef __MINGW32__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
-#if defined(__clang__)
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
 #endif
@@ -97,10 +97,10 @@ DLL_EXPORT DWORD XInputPowerOffController(DWORD dwUserIndex) {
         dwUserIndex);
 }
 
-#if defined(__clang__)
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#if defined(__MINGW32__)
+#ifdef __MINGW32__
 #pragma GCC diagnostic pop
 #endif