diff --git a/.clangd b/.clangd
index 37b860d..24cd55e 100644
--- a/.clangd
+++ b/.clangd
@@ -1,3 +1,2 @@
 CompileFlags:
   CompilationDatabase: bin
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1bfa6c..af79328 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,21 @@ target_include_directories(${OMNIA_STD_LIB} PUBLIC ${INCLUDE_DIRS})
 target_include_directories(${OMNIA_GFX_LIB} PUBLIC ${INCLUDE_DIRS})
 target_include_directories(${TEST_TARGET} PUBLIC ${INCLUDE_DIRS})
 
+if (WIN32)
+set(MSYS2_UCRT64 "C:/msys64/ucrt64")
+	target_include_directories(${OMNIA_STD_LIB} PRIVATE
+								"${MSYS2_UCRT64}/include"
+								"${MSYS2_UCRT64}/include/c++/13.2.0"
+								"${MSYS2_UCRT64}/include/c++/13.2.0/x86_64-w64-mingw32"
+				)
+	set(MSYS2_UCRT64 "C:/msys64/ucrt64")
+	target_include_directories(${OMNIA_GFX_LIB} PRIVATE
+								"${MSYS2_UCRT64}/include"
+								"${MSYS2_UCRT64}/include/c++/13.2.0"
+								"${MSYS2_UCRT64}/include/c++/13.2.0/x86_64-w64-mingw32"
+				)
+endif()
+
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	add_compile_options(-O3 -MMD -MP -Wall -ggdb -fsanitize=address)
 	target_compile_definitions(${OMNIA_STD_LIB} PUBLIC OX_DEBUG_BUILD)
diff --git a/other/build.nr b/other/build.nr
index e8d0f83..b92935d 100644
--- a/other/build.nr
+++ b/other/build.nr
@@ -1 +1 @@
-2031
+2035
diff --git a/src/ostd/io/Console.hpp b/src/ostd/io/Console.hpp
index 847f851..676802f 100644
--- a/src/ostd/io/Console.hpp
+++ b/src/ostd/io/Console.hpp
@@ -23,6 +23,7 @@
 #include <ostd/math/Geometry.hpp>
 #include <ostd/io/IOHandlers.hpp>
 #include <ostd/string/String.hpp>
+#include <ostd/utils/Defines.hpp>
 
 #ifndef WINDOWS_OS
 	#include <termios.h>
diff --git a/src/ostd/io/FileSystem.cpp b/src/ostd/io/FileSystem.cpp
index 9a1043e..5018dd3 100644
--- a/src/ostd/io/FileSystem.cpp
+++ b/src/ostd/io/FileSystem.cpp
@@ -1,6 +1,7 @@
 #include "FileSystem.hpp"
 #include "Logger.hpp"
 #include <fstream>
+#include <ostd/utils/Defines.hpp>
 
 namespace ostd
 {
diff --git a/src/ostd/io/Keyboard.cpp b/src/ostd/io/Keyboard.cpp
index c6fc03c..5940820 100644
--- a/src/ostd/io/Keyboard.cpp
+++ b/src/ostd/io/Keyboard.cpp
@@ -1,5 +1,7 @@
 #include "Console.hpp"
-#include <unistd.h>
+#ifndef WINDOWS_OS
+	#include <unistd.h>
+#endif
 
 namespace ostd
 {
diff --git a/src/ostd/string/String.hpp b/src/ostd/string/String.hpp
index 04c733d..d5d8733 100644
--- a/src/ostd/string/String.hpp
+++ b/src/ostd/string/String.hpp
@@ -63,7 +63,7 @@ namespace ostd
 			inline String(void) { m_data = ""; }
 			inline String(const cpp_string& str) { m_data = str; }
 			inline String(const char* str) { m_data = str; }
-			inline String(const std::filesystem::path& path) { m_data = path; }
+			inline String(const std::filesystem::path& path) { m_data = path.string(); }
 
 			inline cpp_string cpp_str(void) const { return m_data; }
 			inline cpp_string& cpp_str_ref(void) { return m_data; }