diff --git a/include/Nazara/Core/PluginLoader.inl b/include/Nazara/Core/PluginLoader.inl
index 12433185a..70ae4eae6 100644
--- a/include/Nazara/Core/PluginLoader.inl
+++ b/include/Nazara/Core/PluginLoader.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Core/ResourceLoader.inl b/include/Nazara/Core/ResourceLoader.inl
index c11a72f40..848334034 100644
--- a/include/Nazara/Core/ResourceLoader.inl
+++ b/include/Nazara/Core/ResourceLoader.inl
@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <NazaraUtils/PathUtils.hpp>
 #include <Nazara/Core/Config.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
diff --git a/include/Nazara/Core/ResourceSaver.inl b/include/Nazara/Core/ResourceSaver.inl
index 0f2f05607..4775a2451 100644
--- a/include/Nazara/Core/ResourceSaver.inl
+++ b/include/Nazara/Core/ResourceSaver.inl
@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <NazaraUtils/PathUtils.hpp>
 #include <Nazara/Core/Config.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
diff --git a/src/Nazara/Audio/OpenALLibrary.cpp b/src/Nazara/Audio/OpenALLibrary.cpp
index 245efee0c..451440fc1 100644
--- a/src/Nazara/Audio/OpenALLibrary.cpp
+++ b/src/Nazara/Audio/OpenALLibrary.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Audio/OpenALDevice.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <NazaraUtils/Algorithm.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <array>
 #include <sstream>
 #include <stdexcept>
diff --git a/src/Nazara/Core/Posix/DynLibImpl.cpp b/src/Nazara/Core/Posix/DynLibImpl.cpp
index d792db128..9874d7021 100644
--- a/src/Nazara/Core/Posix/DynLibImpl.cpp
+++ b/src/Nazara/Core/Posix/DynLibImpl.cpp
@@ -4,6 +4,7 @@
 
 #include <Nazara/Core/Posix/DynLibImpl.hpp>
 #include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <dlfcn.h>
 #include <cstring>
 #include <Nazara/Core/Debug.hpp>
diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp
index 565603431..4db064b46 100644
--- a/src/Nazara/Core/Posix/FileImpl.cpp
+++ b/src/Nazara/Core/Posix/FileImpl.cpp
@@ -7,6 +7,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp b/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp
index c35f8f2fd..d2b2aa12b 100644
--- a/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp
+++ b/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/VirtualDirectoryFilesystemResolver.hpp>
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp
index 74b4efcc2..41c15a3ce 100644
--- a/src/Nazara/Core/Win32/ThreadImpl.cpp
+++ b/src/Nazara/Core/Win32/ThreadImpl.cpp
@@ -89,8 +89,8 @@ namespace Nz::PlatformImpl
 		info.dwThreadID = threadId;
 		info.dwFlags = 0;
 
-#pragma warning(push)
-#pragma warning(disable: 6320 6322)
+NAZARA_WARNING_PUSH()
+NAZARA_WARNING_MSVC_DISABLE(6320 6322)
 		__try
 		{
 			RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), reinterpret_cast<ULONG_PTR*>(&info));
@@ -98,13 +98,14 @@ namespace Nz::PlatformImpl
 		__except (EXCEPTION_EXECUTE_HANDLER)
 		{
 		}
-#pragma warning(pop)
+NAZARA_WARNING_POP()
+
 #else
 		NazaraWarning("ThreadName exception is only supported with MSVC");
 #endif
 	}
 #endif
-
+ 
 	void SetCurrentThreadName(const char* threadName)
 	{
 		SetThreadName(GetCurrentThreadHandle(), threadName);
diff --git a/src/Nazara/Platform/Window.cpp b/src/Nazara/Platform/Window.cpp
index 3d8fc7e49..1dd8896d9 100644
--- a/src/Nazara/Platform/Window.cpp
+++ b/src/Nazara/Platform/Window.cpp
@@ -41,10 +41,8 @@ namespace Nz
 
 	bool Window::Create(VideoMode mode, const std::string& title, WindowStyleFlags style)
 	{
-#ifdef NAZARA_COMPILER_MSVC
-#pragma warning(push)
-#pragma warning(disable:4701) //< uninitialized variable maybe used (position)
-#endif
+NAZARA_WARNING_PUSH()
+NAZARA_WARNING_MSVC_DISABLE(4701) //< uninitialized variable maybe used (position)
 
 		// If the window is already open, we keep its position
 		bool opened = IsOpen();
@@ -84,9 +82,8 @@ namespace Nz
 
 		m_eventHandler.Dispatch({ { WindowEventType::Created } });
 
-#ifdef NAZARA_COMPILER_MSVC
-#pragma warning(pop)
-#endif
+NAZARA_WARNING_POP()
+
 		return true;
 	}
 
diff --git a/src/Nazara/Utility/Formats/OBJParser.cpp b/src/Nazara/Utility/Formats/OBJParser.cpp
index 2fb2264f5..1bfea7f87 100644
--- a/src/Nazara/Utility/Formats/OBJParser.cpp
+++ b/src/Nazara/Utility/Formats/OBJParser.cpp
@@ -6,6 +6,7 @@
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <tsl/ordered_map.h>
 #include <cctype>
 #include <memory>
diff --git a/xmake.lua b/xmake.lua
index f7a18a274..0787e66e4 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -263,7 +263,7 @@ end
 
 add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
 
-add_requires("entt 3.12.2", "fmt", "frozen", "nazarautils >=2023.12.28")
+add_requires("entt 3.12.2", "fmt", "frozen", "nazarautils >=2024.01.02")
 
 -- Module dependencies
 if has_config("audio") then