diff --git a/.clangd b/.clangd
index 3261667..32169b9 100644
--- a/.clangd
+++ b/.clangd
@@ -1,11 +1,3 @@
 CompileFlags:
-  CompilationDatabase: bin
-  Add:
-    [
-      "-IC:/msys64/ucrt64/include",
-      "-IC:/msys64/ucrt64/include/ucrt",
-      "-IC:/msys64/ucrt64/include/crt",
-      "-IC:/msys64/ucrt64/include/c++/12.2.0",
-      "-IC:/msys64/ucrt64/include/c++/12.2.0/x86_64-w64-mingw32",
-      "-IC:/msys64/ucrt64/usr/include",
-    ]
+    CompilationDatabase: bin
+    Add: ["--target=x86_64-w64-mingw32"]
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35c8e12..8ef766c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,11 @@ if (WIN32)
 								"${MSYS2_UCRT64}/include"
 								"${MSYS2_UCRT64}/include/c++/13.2.0"
 								"${MSYS2_UCRT64}/include/c++/13.2.0/x86_64-w64-mingw32"
+
 				)
+	file(WRITE ${CMAKE_CURRENT_LIST_DIR}/.clangd "CompileFlags:\n    CompilationDatabase: bin\n    Add: [\"--target=x86_64-w64-mingw32\"]")
+else()
+	file(WRITE ${CMAKE_CURRENT_LIST_DIR}/.clangd "CompileFlags:\n    CompilationDatabase: bin")
 endif()
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/other/build.nr b/other/build.nr
index 9adbd23..e83bd43 100644
--- a/other/build.nr
+++ b/other/build.nr
@@ -1 +1 @@
-2042
+2046
diff --git a/src/test/GuiTest.cpp b/src/test/GuiTest.cpp
index 28c63c1..7849d9b 100644
--- a/src/test/GuiTest.cpp
+++ b/src/test/GuiTest.cpp
@@ -38,7 +38,7 @@
  * Tab Panel
  */
 
-#include "utils/Keycodes.hpp"
+#include <ogfx/utils/Keycodes.hpp>
 #include <ogfx/ogfx.hpp>
 
 ostd::ConsoleOutputHandler out;