Update includes for new NazaraUtils version

2023-03-19 13:01:56 +01:00
parent 27996d16d9
commit 9b4d297c04
502 changed files with 622 additions and 622 deletions
--- a/src/Nazara/Audio/Audio.cpp
+++ b/src/Nazara/Audio/Audio.cpp
@@ -17,7 +17,7 @@
 #include <Nazara/Core/Core.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <stdexcept>
 #include <Nazara/Audio/Debug.hpp>

--- a/src/Nazara/Audio/DummyAudioSource.cpp
+++ b/src/Nazara/Audio/DummyAudioSource.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <algorithm>
 #include <Nazara/Audio/Debug.hpp>

--- a/src/Nazara/Audio/Formats/drwavLoader.cpp
+++ b/src/Nazara/Audio/Formats/drwavLoader.cpp
@@ -12,8 +12,8 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <optional>

 #define DR_WAV_IMPLEMENTATION
--- a/src/Nazara/Audio/Formats/drwavLoader.hpp
+++ b/src/Nazara/Audio/Formats/drwavLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_AUDIO_FORMATS_DRWAVLOADER_HPP
 #define NAZARA_AUDIO_FORMATS_DRWAVLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Audio/SoundBuffer.hpp>
 #include <Nazara/Audio/SoundStream.hpp>

--- a/src/Nazara/Audio/Formats/libflacLoader.cpp
+++ b/src/Nazara/Audio/Formats/libflacLoader.cpp
@@ -12,9 +12,9 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
-#include <Nazara/Utils/Endianness.hpp>
 #include <FLAC/stream_decoder.h>
+#include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <optional>
 #include <set>
 #include <Nazara/Audio/Debug.hpp>
--- a/src/Nazara/Audio/Formats/libflacLoader.hpp
+++ b/src/Nazara/Audio/Formats/libflacLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_AUDIO_FORMATS_LIBFLACLOADER_HPP
 #define NAZARA_AUDIO_FORMATS_LIBFLACLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Audio/SoundBuffer.hpp>
 #include <Nazara/Audio/SoundStream.hpp>

--- a/src/Nazara/Audio/Formats/libvorbisLoader.cpp
+++ b/src/Nazara/Audio/Formats/libvorbisLoader.cpp
@@ -12,8 +12,8 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <frozen/string.h>
 #include <frozen/unordered_set.h>
 #include <optional>
--- a/src/Nazara/Audio/Formats/libvorbisLoader.hpp
+++ b/src/Nazara/Audio/Formats/libvorbisLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_AUDIO_FORMATS_LIBVORBISLOADER_HPP
 #define NAZARA_AUDIO_FORMATS_LIBVORBISLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Audio/SoundBuffer.hpp>
 #include <Nazara/Audio/SoundStream.hpp>

--- a/src/Nazara/Audio/Formats/minimp3Loader.cpp
+++ b/src/Nazara/Audio/Formats/minimp3Loader.cpp
@@ -12,7 +12,7 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <optional>

 #define MINIMP3_IMPLEMENTATION
--- a/src/Nazara/Audio/Formats/minimp3Loader.hpp
+++ b/src/Nazara/Audio/Formats/minimp3Loader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_AUDIO_FORMATS_MINIMP3LOADER_HPP
 #define NAZARA_AUDIO_FORMATS_MINIMP3LOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Audio/SoundBuffer.hpp>
 #include <Nazara/Audio/SoundStream.hpp>

--- a/src/Nazara/Audio/Music.cpp
+++ b/src/Nazara/Audio/Music.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Audio/AudioDevice.hpp>
 #include <Nazara/Audio/AudioSource.hpp>
 #include <Nazara/Audio/SoundStream.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <chrono>
 #include <optional>
--- a/src/Nazara/Audio/OpenALLibrary.cpp
+++ b/src/Nazara/Audio/OpenALLibrary.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringExt.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <cstring>
 #include <sstream>
--- a/src/Nazara/Audio/OpenALSource.cpp
+++ b/src/Nazara/Audio/OpenALSource.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Audio/OpenALLibrary.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <Nazara/Audio/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Core/Darwin/TimeImpl.hpp
+++ b/src/Nazara/Core/Darwin/TimeImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_DARWIN_TIMEIMPL_HPP
 #define NAZARA_CORE_DARWIN_TIMEIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Time.hpp>

 namespace Nz
--- a/src/Nazara/Core/Error.cpp
+++ b/src/Nazara/Core/Error.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringExt.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <cstdlib>
 #include <stdexcept>

--- a/src/Nazara/Core/FileLogger.cpp
+++ b/src/Nazara/Core/FileLogger.cpp
@@ -4,7 +4,7 @@

 #include <Nazara/Core/FileLogger.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <ctime>
 #include <filesystem>
--- a/src/Nazara/Core/GuillotineBinPack.cpp
+++ b/src/Nazara/Core/GuillotineBinPack.cpp
@@ -8,7 +8,7 @@

 #include <Nazara/Core/GuillotineBinPack.hpp>
 #include <Nazara/Core/Config.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <algorithm>
 #include <limits>
 #include <Nazara/Core/Debug.hpp>
--- a/src/Nazara/Core/Hash/CRC32.cpp
+++ b/src/Nazara/Core/Hash/CRC32.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Core/Hash/CRC32.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <Nazara/Core/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Core/Hash/CRC64.cpp
+++ b/src/Nazara/Core/Hash/CRC64.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Core/Hash/CRC64.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <Nazara/Core/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Core/Hash/Fletcher16.cpp
+++ b/src/Nazara/Core/Hash/Fletcher16.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Core/Hash/Fletcher16.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <Nazara/Core/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Core/Hash/MD5.cpp
+++ b/src/Nazara/Core/Hash/MD5.cpp
@@ -27,7 +27,7 @@
 */

 #include <Nazara/Core/Hash/MD5.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <cstring>
 #include <Nazara/Core/Debug.hpp>

--- a/src/Nazara/Core/Hash/SHA/Internal.cpp
+++ b/src/Nazara/Core/Hash/SHA/Internal.cpp
@@ -38,7 +38,7 @@
 */

 #include <Nazara/Core/Hash/SHA/Internal.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <cstring>
 #include <Nazara/Core/Debug.hpp>

--- a/src/Nazara/Core/Hash/SHA/Internal.hpp
+++ b/src/Nazara/Core/Hash/SHA/Internal.hpp
@@ -42,7 +42,7 @@
 #ifndef NAZARA_CORE_HASH_SHA_INTERNAL_HPP
 #define NAZARA_CORE_HASH_SHA_INTERNAL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <cstddef>

 /* Digest lengths for SHA-1/224/256/384/512 */
--- a/src/Nazara/Core/ParameterList.cpp
+++ b/src/Nazara/Core/ParameterList.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
-#include <Nazara/Utils/MemoryHelper.hpp>
+#include <NazaraUtils/MemoryHelper.hpp>
 #include <cstring>
 #include <Nazara/Core/Debug.hpp>

--- a/src/Nazara/Core/PluginLoader.cpp
+++ b/src/Nazara/Core/PluginLoader.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Core/PluginLoader.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Utils/Algorithm.hpp>
+#include <NazaraUtils/Algorithm.hpp>
 #include <stdexcept>
 #include <Nazara/Core/Debug.hpp>

--- a/src/Nazara/Core/Posix/FileImpl.hpp
+++ b/src/Nazara/Core/Posix/FileImpl.hpp
@@ -11,7 +11,7 @@
 #define _LARGEFILE64_SOURCE
 #endif

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Enums.hpp>
 #include <ctime>
 #include <filesystem>
--- a/src/Nazara/Core/Posix/HardwareInfoImpl.hpp
+++ b/src/Nazara/Core/Posix/HardwareInfoImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_POSIX_HARDWAREINFOIMPL_HPP
 #define NAZARA_CORE_POSIX_HARDWAREINFOIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>

 namespace Nz
 {
--- a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
+++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_POSIX_TASKSCHEDULERIMPL_HPP
 #define NAZARA_CORE_POSIX_TASKSCHEDULERIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <atomic>
 #include <memory>
 #include <queue>
--- a/src/Nazara/Core/Posix/TimeImpl.hpp
+++ b/src/Nazara/Core/Posix/TimeImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_POSIX_TIMEIMPL_HPP
 #define NAZARA_CORE_POSIX_TIMEIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Time.hpp>

 namespace Nz
--- a/src/Nazara/Core/Stream.cpp
+++ b/src/Nazara/Core/Stream.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Core/ByteArray.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <cstring>
 #include <Nazara/Core/Debug.hpp>

--- 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 <Nazara/Utils/Algorithm.hpp>
+#include <NazaraUtils/Algorithm.hpp>
 #include <Nazara/Core/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Core/Win32/DynLibImpl.hpp
+++ b/src/Nazara/Core/Win32/DynLibImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_WIN32_DYNLIBIMPL_HPP
 #define NAZARA_CORE_WIN32_DYNLIBIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <filesystem>
 #include <windows.h>
--- a/src/Nazara/Core/Win32/FileImpl.cpp
+++ b/src/Nazara/Core/Win32/FileImpl.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Core/Win32/Utils.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <memory>
 #include <Nazara/Core/Debug.hpp>

--- a/src/Nazara/Core/Win32/FileImpl.hpp
+++ b/src/Nazara/Core/Win32/FileImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_WIN32_FILEIMPL_HPP
 #define NAZARA_CORE_WIN32_FILEIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/File.hpp>
 #include <ctime>
 #include <windows.h>
--- a/src/Nazara/Core/Win32/HardwareInfoImpl.hpp
+++ b/src/Nazara/Core/Win32/HardwareInfoImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_WIN32_HARDWAREINFOIMPL_HPP
 #define NAZARA_CORE_WIN32_HARDWAREINFOIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>

 namespace Nz
 {
--- a/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp
+++ b/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_WIN32_TASKSCHEDULERIMPL_HPP
 #define NAZARA_CORE_WIN32_TASKSCHEDULERIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Functor.hpp>
 #include <atomic>
 #include <memory>
--- a/src/Nazara/Core/Win32/TimeImpl.hpp
+++ b/src/Nazara/Core/Win32/TimeImpl.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_WIN32_TIMEIMPL_HPP
 #define NAZARA_CORE_WIN32_TIMEIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Time.hpp>

 namespace Nz
--- a/src/Nazara/Core/Win32/Utils.hpp
+++ b/src/Nazara/Core/Win32/Utils.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_CORE_WIN32_UTILS_HPP
 #define NAZARA_CORE_WIN32_UTILS_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <ctime>
 #include <windows.h>

--- a/src/Nazara/Graphics/Formats/TextureLoader.hpp
+++ b/src/Nazara/Graphics/Formats/TextureLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_GRAPHICS_FORMATS_TEXTURELOADER_HPP
 #define NAZARA_GRAPHICS_FORMATS_TEXTURELOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Graphics/MaterialInstance.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Graphics/ForwardFramePipeline.cpp
+++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp
@@ -21,7 +21,7 @@
 #include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/RenderTarget.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <array>
 #include <Nazara/Graphics/Debug.hpp>

--- a/src/Nazara/Graphics/FrameGraph.cpp
+++ b/src/Nazara/Graphics/FrameGraph.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Graphics/FrameGraph.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <stdexcept>
 #include <unordered_set>
 #include <Nazara/Graphics/Debug.hpp>
--- a/src/Nazara/Graphics/TextSprite.cpp
+++ b/src/Nazara/Graphics/TextSprite.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Graphics/RenderSpriteChain.hpp>
 #include <Nazara/Graphics/WorldInstance.hpp>
 #include <Nazara/Utility/AbstractTextDrawer.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/ViewerInstance.cpp
+++ b/src/Nazara/Graphics/ViewerInstance.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/WorldInstance.cpp
+++ b/src/Nazara/Graphics/WorldInstance.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Network/ENetHost.cpp
+++ b/src/Nazara/Network/ENetHost.cpp
@@ -17,7 +17,7 @@
 #include <Nazara/Network/Algorithm.hpp>
 #include <Nazara/Network/ENetPeer.hpp>
 #include <Nazara/Network/NetPacket.hpp>
-#include <Nazara/Utils/OffsetOf.hpp>
+#include <NazaraUtils/OffsetOf.hpp>
 #include <Nazara/Network/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Network/ENetPacket.cpp
+++ b/src/Nazara/Network/ENetPacket.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Network/ENetPacket.hpp>
-#include <Nazara/Utils/MemoryPool.hpp>
+#include <NazaraUtils/MemoryPool.hpp>
 #include <Nazara/Network/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Network/Network.cpp
+++ b/src/Nazara/Network/Network.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Network/Config.hpp>
 #include <Nazara/Network/NetPacket.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>

 #if defined(NAZARA_PLATFORM_WINDOWS)
 #include <Nazara/Network/Win32/SocketImpl.hpp>
--- a/src/Nazara/Network/Posix/IpAddressImpl.cpp
+++ b/src/Nazara/Network/Posix/IpAddressImpl.cpp
@@ -7,7 +7,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Network/Posix/SocketImpl.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <cstring>
 #include <Nazara/Network/Debug.hpp>

--- a/src/Nazara/Network/Posix/SocketImpl.cpp
+++ b/src/Nazara/Network/Posix/SocketImpl.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Network/Algorithm.hpp>
 #include <Nazara/Network/NetBuffer.hpp>
 #include <Nazara/Network/Posix/IpAddressImpl.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <cstring>
 #include <poll.h>
 #include <unistd.h>
--- a/src/Nazara/Network/TcpClient.cpp
+++ b/src/Nazara/Network/TcpClient.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Network/NetPacket.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <limits>

 #if defined(NAZARA_PLATFORM_WINDOWS)
--- a/src/Nazara/Network/Win32/IpAddressImpl.cpp
+++ b/src/Nazara/Network/Win32/IpAddressImpl.cpp
@@ -7,7 +7,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Network/Win32/SocketImpl.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <cstring>
 #include <Nazara/Network/Debug.hpp>

--- a/src/Nazara/Network/Win32/SocketImpl.cpp
+++ b/src/Nazara/Network/Win32/SocketImpl.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Network/Win32/IpAddressImpl.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>

 // Some compilers (older versions of MinGW) lack Mstcpip.h which defines some structs/defines
 #if defined(__has_include)
--- a/src/Nazara/OpenGLRenderer/Export.cpp
+++ b/src/Nazara/OpenGLRenderer/Export.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - OpenGL renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLRenderer.hpp>

 #ifndef NAZARA_RENDERER_EMBEDDEDBACKENDS
--- a/src/Nazara/OpenGLRenderer/OpenGLBuffer.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLBuffer.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/OpenGLRenderer/OpenGLBuffer.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

--- a/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp
@@ -11,8 +11,8 @@
 #include <Nazara/OpenGLRenderer/OpenGLVaoCache.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/VertexArray.hpp>
-#include <Nazara/Utils/StackArray.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/StackArray.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

 namespace Nz
--- a/src/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.cpp
@@ -11,7 +11,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLUploadPool.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

--- a/src/Nazara/OpenGLRenderer/OpenGLCommandPool.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLCommandPool.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLCommandPool.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp>
-#include <Nazara/Utils/MemoryHelper.hpp>
+#include <NazaraUtils/MemoryHelper.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

 namespace Nz
--- a/src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLRenderPass.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

--- a/src/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.cpp
@@ -5,8 +5,8 @@
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/OpenGLRenderer/Utils.hpp>
-#include <Nazara/Utils/MemoryHelper.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/MemoryHelper.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <cassert>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
--- a/src/Nazara/OpenGLRenderer/OpenGLShaderBinding.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLShaderBinding.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

 namespace Nz
--- a/src/Nazara/OpenGLRenderer/OpenGLTexture.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLTexture.cpp
@@ -4,7 +4,7 @@

 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>

--- a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp
@@ -10,7 +10,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
 #include <Nazara/OpenGLRenderer/Utils.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Framebuffer.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <cstring>
 #include <sstream>
 #include <stdexcept>
--- a/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <cassert>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
--- a/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <cassert>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
--- a/src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Web/WebLoader.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <cassert>
 #include <cstdlib>
--- a/src/Nazara/Physics2D/Collider2D.cpp
+++ b/src/Nazara/Physics2D/Collider2D.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <chipmunk/chipmunk.h>
 #include <chipmunk/chipmunk_structs.h>
 #include <array>
--- a/src/Nazara/Physics2D/PhysWorld2D.cpp
+++ b/src/Nazara/Physics2D/PhysWorld2D.cpp
@@ -4,7 +4,7 @@

 #include <Nazara/Physics2D/PhysWorld2D.hpp>
 #include <Nazara/Physics2D/Arbiter2D.hpp>
-#include <Nazara/Utils/StackArray.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <chipmunk/chipmunk.h>
 #include <Nazara/Physics2D/Debug.hpp>

--- a/src/Nazara/Physics3D/PhysWorld3D.cpp
+++ b/src/Nazara/Physics3D/PhysWorld3D.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Physics3D/PhysWorld3D.hpp>
-#include <Nazara/Utils/StackVector.hpp>
+#include <NazaraUtils/StackVector.hpp>
 #include <newton/Newton.h>
 #include <cassert>
 #include <Nazara/Physics3D/Debug.hpp>
--- a/src/Nazara/Platform/Platform.cpp
+++ b/src/Nazara/Platform/Platform.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Platform/Config.hpp>
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/Window.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <Nazara/Platform/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Platform/SDL2/CursorImpl.hpp
+++ b/src/Nazara/Platform/SDL2/CursorImpl.hpp
@@ -7,12 +7,12 @@
 #ifndef NAZARA_PLATFORM_SDL2_CURSORIMPL_HPP
 #define NAZARA_PLATFORM_SDL2_CURSORIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/Enums.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <Nazara/Utils/MovablePtr.hpp>
 #include <SDL_mouse.h>
+#include <NazaraUtils/MovablePtr.hpp>

 namespace Nz
 {
--- a/src/Nazara/Platform/SDL2/IconImpl.hpp
+++ b/src/Nazara/Platform/SDL2/IconImpl.hpp
@@ -7,10 +7,10 @@
 #ifndef NAZARA_PLATFORM_SDL2_ICONIMPL_HPP
 #define NAZARA_PLATFORM_SDL2_ICONIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <Nazara/Utils/MovablePtr.hpp>
 #include <SDL_surface.h>
+#include <NazaraUtils/MovablePtr.hpp>

 namespace Nz
 {
--- a/src/Nazara/Platform/SDL2/InputImpl.cpp
+++ b/src/Nazara/Platform/SDL2/InputImpl.cpp
@@ -7,11 +7,11 @@
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Platform/SDL2/SDLHelper.hpp>
 #include <Nazara/Platform/SDL2/WindowImpl.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
 #include <SDL_clipboard.h>
 #include <SDL_keyboard.h>
 #include <SDL_keycode.h>
 #include <SDL_mouse.h>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <Nazara/Platform/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Platform/SDL2/WindowImpl.hpp
+++ b/src/Nazara/Platform/SDL2/WindowImpl.hpp
@@ -9,7 +9,7 @@
 #ifndef NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP
 #define NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/Config.hpp>
--- a/src/Nazara/Platform/Window.cpp
+++ b/src/Nazara/Platform/Window.cpp
@@ -7,7 +7,7 @@
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/Icon.hpp>
 #include <Nazara/Platform/SDL2/WindowImpl.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <Nazara/Platform/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Renderer/Renderer.cpp
+++ b/src/Nazara/Renderer/Renderer.cpp
@@ -12,7 +12,7 @@
 #include <Nazara/Utility/Buffer.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <Nazara/Utility/Utility.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <filesystem>
 #include <stdexcept>

--- a/src/Nazara/Utility/Formats/DDSConstants.hpp
+++ b/src/Nazara/Utility/Formats/DDSConstants.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_DDSCONSTANTS_HPP
 #define NAZARA_UTILITY_FORMATS_DDSCONSTANTS_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/SerializationContext.hpp>
 #include <Nazara/Utility/Config.hpp>

--- a/src/Nazara/Utility/Formats/DDSLoader.hpp
+++ b/src/Nazara/Utility/Formats/DDSLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_DDSLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_DDSLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp
+++ b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp
@@ -8,7 +8,7 @@
 #include FT_BITMAP_H
 #include FT_STROKER_H
 #include FT_OUTLINE_H
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
--- a/src/Nazara/Utility/Formats/FreeTypeLoader.hpp
+++ b/src/Nazara/Utility/Formats/FreeTypeLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_FREETYPELOADER_HPP
 #define NAZARA_UTILITY_FORMATS_FREETYPELOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Font.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/GIFLoader.cpp
+++ b/src/Nazara/Utility/Formats/GIFLoader.cpp
@@ -8,9 +8,9 @@
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <Nazara/Utility/Formats/STBLoader.hpp>
-#include <Nazara/Utils/Bitset.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Bitset.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <Nazara/Utility/Debug.hpp>

 // based on https://www.w3.org/Graphics/GIF/spec-gif89a.txt, with help from the following public domain libraries source code:
--- a/src/Nazara/Utility/Formats/GIFLoader.hpp
+++ b/src/Nazara/Utility/Formats/GIFLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_GIFLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_GIFLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <Nazara/Utility/ImageStream.hpp>

--- a/src/Nazara/Utility/Formats/MD2Constants.hpp
+++ b/src/Nazara/Utility/Formats/MD2Constants.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_MD2CONSTANTS_HPP
 #define NAZARA_UTILITY_FORMATS_MD2CONSTANTS_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Math/Vector3.hpp>

 namespace Nz
--- a/src/Nazara/Utility/Formats/MD2Loader.cpp
+++ b/src/Nazara/Utility/Formats/MD2Loader.cpp
@@ -11,7 +11,7 @@
 #include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexMapper.hpp>
 #include <Nazara/Utility/Formats/MD2Constants.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <array>
 #include <cassert>
 #include <memory>
--- a/src/Nazara/Utility/Formats/MD2Loader.hpp
+++ b/src/Nazara/Utility/Formats/MD2Loader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_MD2LOADER_HPP
 #define NAZARA_UTILITY_FORMATS_MD2LOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Mesh.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/MD5AnimLoader.hpp
+++ b/src/Nazara/Utility/Formats/MD5AnimLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_MD5ANIMLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_MD5ANIMLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Animation.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/MD5MeshLoader.hpp
+++ b/src/Nazara/Utility/Formats/MD5MeshLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_MD5MESHLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_MD5MESHLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Mesh.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/MTLParser.cpp
+++ b/src/Nazara/Utility/Formats/MTLParser.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Utility/Formats/MTLParser.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Utility/Config.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <cstdio>
 #include <Nazara/Utility/Debug.hpp>

--- a/src/Nazara/Utility/Formats/OBJLoader.hpp
+++ b/src/Nazara/Utility/Formats/OBJLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_OBJLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_OBJLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Mesh.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/OBJParser.cpp
+++ b/src/Nazara/Utility/Formats/OBJParser.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Utility/Formats/OBJParser.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Utility/Config.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <tsl/ordered_map.h>
 #include <cctype>
 #include <memory>
--- a/src/Nazara/Utility/Formats/OBJSaver.hpp
+++ b/src/Nazara/Utility/Formats/OBJSaver.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_OBJSAVER_HPP
 #define NAZARA_UTILITY_FORMATS_OBJSAVER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Mesh.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/PCXLoader.cpp
+++ b/src/Nazara/Utility/Formats/PCXLoader.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <memory>
 #include <Nazara/Utility/Debug.hpp>

--- a/src/Nazara/Utility/Formats/PCXLoader.hpp
+++ b/src/Nazara/Utility/Formats/PCXLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_PCXLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_PCXLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/STBLoader.cpp
+++ b/src/Nazara/Utility/Formats/STBLoader.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <frozen/string.h>
 #include <frozen/unordered_set.h>

--- a/src/Nazara/Utility/Formats/STBLoader.hpp
+++ b/src/Nazara/Utility/Formats/STBLoader.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_STBLOADER_HPP
 #define NAZARA_UTILITY_FORMATS_STBLOADER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/Formats/STBSaver.hpp
+++ b/src/Nazara/Utility/Formats/STBSaver.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_FORMATS_STBSAVER_HPP
 #define NAZARA_UTILITY_FORMATS_STBSAVER_HPP

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>

 namespace Nz::Loaders
--- a/src/Nazara/Utility/PixelFormat.cpp
+++ b/src/Nazara/Utility/PixelFormat.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Math/Algorithm.hpp>
-#include <Nazara/Utils/Endianness.hpp>
+#include <NazaraUtils/Endianness.hpp>
 #include <Nazara/Utility/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Utility/Utility.cpp
+++ b/src/Nazara/Utility/Utility.cpp
@@ -25,7 +25,7 @@
 #include <Nazara/Utility/Formats/PCXLoader.hpp>
 #include <Nazara/Utility/Formats/STBLoader.hpp>
 #include <Nazara/Utility/Formats/STBSaver.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <stdexcept>
 #include <Nazara/Utility/Debug.hpp>

--- a/src/Nazara/Utility/VertexDeclaration.cpp
+++ b/src/Nazara/Utility/VertexDeclaration.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Utility.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
-#include <Nazara/Utils/OffsetOf.hpp>
+#include <NazaraUtils/OffsetOf.hpp>
 #include <Nazara/Utility/Debug.hpp>

 namespace Nz
--- a/src/Nazara/VulkanRenderer/Export.cpp
+++ b/src/Nazara/VulkanRenderer/Export.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp

-#include <Nazara/Prerequisites.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderer.hpp>

 #ifndef NAZARA_RENDERER_EMBEDDEDBACKENDS
--- a/src/Nazara/VulkanRenderer/Vulkan.cpp
+++ b/src/Nazara/VulkanRenderer/Vulkan.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Utility/Utility.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/VulkanDevice.hpp>
-#include <Nazara/Utils/CallOnExit.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <array>
 #include <unordered_set>
 #include <Nazara/VulkanRenderer/Debug.hpp>
--- a/Show More
+++ b/Show More