Apply header guard check

2021-10-26 15:52:46 +02:00
parent b85f6b68ac
commit 93ec196dc4
476 changed files with 1414 additions and 1327 deletions
--- a/include/Nazara/Utility/AbstractAtlas.hpp
+++ b/include/Nazara/Utility/AbstractAtlas.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ABSTRACTATLAS_HPP
-#define NAZARA_ABSTRACTATLAS_HPP
+#ifndef NAZARA_UTILITY_ABSTRACTATLAS_HPP
+#define NAZARA_UTILITY_ABSTRACTATLAS_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Signal.hpp>
@@ -44,4 +44,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_ABSTRACTATLAS_HPP
+#endif // NAZARA_UTILITY_ABSTRACTATLAS_HPP
--- a/include/Nazara/Utility/AbstractBuffer.hpp
+++ b/include/Nazara/Utility/AbstractBuffer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ABSTRACTBUFFER_HPP
-#define NAZARA_ABSTRACTBUFFER_HPP
+#ifndef NAZARA_UTILITY_ABSTRACTBUFFER_HPP
+#define NAZARA_UTILITY_ABSTRACTBUFFER_HPP

 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
@@ -30,4 +30,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_ABSTRACTBUFFER_HPP
+#endif // NAZARA_UTILITY_ABSTRACTBUFFER_HPP
--- a/include/Nazara/Utility/AbstractImage.hpp
+++ b/include/Nazara/Utility/AbstractImage.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ABSTRACTIMAGE_HPP
-#define NAZARA_ABSTRACTIMAGE_HPP
+#ifndef NAZARA_UTILITY_ABSTRACTIMAGE_HPP
+#define NAZARA_UTILITY_ABSTRACTIMAGE_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Math/Box.hpp>
@@ -46,4 +46,4 @@ namespace Nz

 #include <Nazara/Utility/AbstractImage.inl>

-#endif // NAZARA_IMAGE_HPP
+#endif // NAZARA_UTILITY_ABSTRACTIMAGE_HPP
--- a/include/Nazara/Utility/AbstractTextDrawer.hpp
+++ b/include/Nazara/Utility/AbstractTextDrawer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ABSTRACTTEXTDRAWER_HPP
-#define NAZARA_ABSTRACTTEXTDRAWER_HPP
+#ifndef NAZARA_UTILITY_ABSTRACTTEXTDRAWER_HPP
+#define NAZARA_UTILITY_ABSTRACTTEXTDRAWER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
@@ -63,4 +63,4 @@ namespace Nz

 #include <Nazara/Utility/AbstractTextDrawer.inl>

-#endif // NAZARA_ABSTRACTTEXTDRAWER_HPP
+#endif // NAZARA_UTILITY_ABSTRACTTEXTDRAWER_HPP
--- a/include/Nazara/Utility/Algorithm.hpp
+++ b/include/Nazara/Utility/Algorithm.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ALGORITHM_UTILITY_HPP
-#define NAZARA_ALGORITHM_UTILITY_HPP
+#ifndef NAZARA_UTILITY_ALGORITHM_HPP
+#define NAZARA_UTILITY_ALGORITHM_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
@@ -71,4 +71,4 @@ namespace Nz
 }
 #include <Nazara/Utility/Algorithm.inl>

-#endif // NAZARA_ALGORITHM_UTILITY_HPP
+#endif // NAZARA_UTILITY_ALGORITHM_HPP
--- a/include/Nazara/Utility/Animation.hpp
+++ b/include/Nazara/Utility/Animation.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ANIMATION_HPP
-#define NAZARA_ANIMATION_HPP
+#ifndef NAZARA_UTILITY_ANIMATION_HPP
+#define NAZARA_UTILITY_ANIMATION_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
@@ -93,4 +93,4 @@ namespace Nz

 #include <Nazara/Utility/Animation.inl>

-#endif // NAZARA_ANIMATION_HPP
+#endif // NAZARA_UTILITY_ANIMATION_HPP
--- a/include/Nazara/Utility/Buffer.hpp
+++ b/include/Nazara/Utility/Buffer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_BUFFER_HPP
-#define NAZARA_BUFFER_HPP
+#ifndef NAZARA_UTILITY_BUFFER_HPP
+#define NAZARA_UTILITY_BUFFER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/AbstractBuffer.hpp>
@@ -75,4 +75,4 @@ namespace Nz

 #include <Nazara/Utility/Buffer.inl>

-#endif // NAZARA_BUFFER_HPP
+#endif // NAZARA_UTILITY_BUFFER_HPP
--- a/include/Nazara/Utility/BufferMapper.hpp
+++ b/include/Nazara/Utility/BufferMapper.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_BUFFERMAPPER_HPP
-#define NAZARA_BUFFERMAPPER_HPP
+#ifndef NAZARA_UTILITY_BUFFERMAPPER_HPP
+#define NAZARA_UTILITY_BUFFERMAPPER_HPP

 #include <Nazara/Utility/Enums.hpp>

@@ -40,4 +40,4 @@ namespace Nz

 #include <Nazara/Utility/BufferMapper.inl>

-#endif // NAZARA_BUFFERMAPPER_HPP
+#endif // NAZARA_UTILITY_BUFFERMAPPER_HPP
--- a/include/Nazara/Utility/Components.hpp
+++ b/include/Nazara/Utility/Components.hpp
@@ -1,9 +1,9 @@
-// This file was automatically generated
+// this file was automatically generated and should not be edited

 /*
 	Nazara Engine - Utility module

-	Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com)
+	Copyright (C) 2021 Jérôme "Lynix" Leclercq (lynix680@gmail.com)

 	Permission is hereby granted, free of charge, to any person obtaining a copy of
 	this software and associated documentation files (the "Software"), to deal in
@@ -26,9 +26,9 @@

 #pragma once

-#ifndef NAZARA_GLOBAL_UTILITY_COMPONENTS_HPP
-#define NAZARA_GLOBAL_UTILITY_COMPONENTS_HPP
+#ifndef NAZARA_UTILITY_COMPONENTS_HPP
+#define NAZARA_UTILITY_COMPONENTS_HPP

 #include <Nazara/Utility/Components/NodeComponent.hpp>

-#endif // NAZARA_GLOBAL_UTILITY_COMPONENTS_HPP
+#endif // NAZARA_UTILITY_COMPONENTS_HPP
--- a/include/Nazara/Utility/Components/NodeComponent.hpp
+++ b/include/Nazara/Utility/Components/NodeComponent.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_NODECOMPONENT_HPP
-#define NAZARA_NODECOMPONENT_HPP
+#ifndef NAZARA_UTILITY_COMPONENTS_NODECOMPONENT_HPP
+#define NAZARA_UTILITY_COMPONENTS_NODECOMPONENT_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ECS.hpp>
@@ -31,4 +31,4 @@ namespace Nz

 #include <Nazara/Utility/Components/NodeComponent.inl>

-#endif
+#endif // NAZARA_UTILITY_COMPONENTS_NODECOMPONENT_HPP
--- a/include/Nazara/Utility/Config.hpp
+++ b/include/Nazara/Utility/Config.hpp
@@ -24,8 +24,8 @@

 #pragma once

-#ifndef NAZARA_CONFIG_UTILITY_HPP
-#define NAZARA_CONFIG_UTILITY_HPP
+#ifndef NAZARA_UTILITY_CONFIG_HPP
+#define NAZARA_UTILITY_CONFIG_HPP

 /// Each modification of a parameter needs a recompilation of the module

@@ -62,4 +62,4 @@
 	#endif
 #endif

-#endif // NAZARA_CONFIG_UTILITY_HPP
+#endif // NAZARA_UTILITY_CONFIG_HPP
--- a/include/Nazara/Utility/ConfigCheck.hpp
+++ b/include/Nazara/Utility/ConfigCheck.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_CONFIG_CHECK_UTILITY_HPP
-#define NAZARA_CONFIG_CHECK_UTILITY_HPP
+#ifndef NAZARA_UTILITY_CONFIGCHECK_HPP
+#define NAZARA_UTILITY_CONFIGCHECK_HPP

 /// This file is used to check the constant values defined in Config.hpp

@@ -22,4 +22,4 @@ NazaraCheckTypeAndVal(NAZARA_UTILITY_SKINNING_MAX_WEIGHTS, integral, >, 0, " sha

 #undef NazaraCheckTypeAndVal

-#endif // NAZARA_CONFIG_CHECK_UTILITY_HPP
+#endif // NAZARA_UTILITY_CONFIGCHECK_HPP
--- a/include/Nazara/Utility/CubemapParams.hpp
+++ b/include/Nazara/Utility/CubemapParams.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_CUBEMAPPARAMS_HPP
-#define NAZARA_CUBEMAPPARAMS_HPP
+#ifndef NAZARA_UTILITY_CUBEMAPPARAMS_HPP
+#define NAZARA_UTILITY_CUBEMAPPARAMS_HPP

 #include <Nazara/Math/Vector2.hpp>

@@ -35,4 +35,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_CUBEMAPPARAMS_HPP
+#endif // NAZARA_UTILITY_CUBEMAPPARAMS_HPP
--- a/include/Nazara/Utility/Debug.hpp
+++ b/include/Nazara/Utility/Debug.hpp
@@ -2,6 +2,8 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp

+// no header guards
+
 #include <Nazara/Utility/Config.hpp>
 #if NAZARA_UTILITY_MANAGE_MEMORY
 	#include <Nazara/Core/Debug/NewRedefinition.hpp>
--- a/include/Nazara/Utility/DebugOff.hpp
+++ b/include/Nazara/Utility/DebugOff.hpp
@@ -2,6 +2,8 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp

+// no header guards
+
 // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp
 #if NAZARA_UTILITY_MANAGE_MEMORY
 	#undef delete
--- a/include/Nazara/Utility/Enums.hpp
+++ b/include/Nazara/Utility/Enums.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_ENUMS_UTILITY_HPP
-#define NAZARA_ENUMS_UTILITY_HPP
+#ifndef NAZARA_UTILITY_ENUMS_HPP
+#define NAZARA_UTILITY_ENUMS_HPP

 #include <Nazara/Core/Flags.hpp>

@@ -481,4 +481,4 @@ namespace Nz
 	constexpr std::size_t VertexLayoutCount = static_cast<std::size_t>(VertexLayout::Max) + 1;
 }

-#endif // NAZARA_ENUMS_UTILITY_HPP
+#endif // NAZARA_UTILITY_ENUMS_HPP
--- a/include/Nazara/Utility/FieldOffsets.hpp
+++ b/include/Nazara/Utility/FieldOffsets.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FIELDOFFSETS_HPP
-#define NAZARA_FIELDOFFSETS_HPP
+#ifndef NAZARA_UTILITY_FIELDOFFSETS_HPP
+#define NAZARA_UTILITY_FIELDOFFSETS_HPP

 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
@@ -48,4 +48,4 @@ namespace Nz

 #include <Nazara/Utility/FieldOffsets.inl>

-#endif // NAZARA_FIELDOFFSETS_HPP
+#endif // NAZARA_UTILITY_FIELDOFFSETS_HPP
--- a/include/Nazara/Utility/Font.hpp
+++ b/include/Nazara/Utility/Font.hpp
@@ -6,8 +6,8 @@

 #pragma once

-#ifndef NAZARA_FONT_HPP
-#define NAZARA_FONT_HPP
+#ifndef NAZARA_UTILITY_FONT_HPP
+#define NAZARA_UTILITY_FONT_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
@@ -157,4 +157,4 @@ namespace Nz

 #include <Nazara/Utility/Font.inl>

-#endif // NAZARA_FONT_HPP
+#endif // NAZARA_UTILITY_FONT_HPP
--- a/include/Nazara/Utility/FontData.hpp
+++ b/include/Nazara/Utility/FontData.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FONTDATA_HPP
-#define NAZARA_FONTDATA_HPP
+#ifndef NAZARA_UTILITY_FONTDATA_HPP
+#define NAZARA_UTILITY_FONTDATA_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Config.hpp>
@@ -41,4 +41,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_FONTDATA_HPP
+#endif // NAZARA_UTILITY_FONTDATA_HPP
--- a/include/Nazara/Utility/FontGlyph.hpp
+++ b/include/Nazara/Utility/FontGlyph.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FONTGLYPH_HPP
-#define NAZARA_FONTGLYPH_HPP
+#ifndef NAZARA_UTILITY_FONTGLYPH_HPP
+#define NAZARA_UTILITY_FONTGLYPH_HPP

 #include <Nazara/Utility/Image.hpp>

@@ -19,4 +19,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_FONTGLYPH_HPP
+#endif // NAZARA_UTILITY_FONTGLYPH_HPP
--- a/include/Nazara/Utility/Formats/MD5AnimParser.hpp
+++ b/include/Nazara/Utility/Formats/MD5AnimParser.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FORMATS_MD5ANIMPARSER_HPP
-#define NAZARA_FORMATS_MD5ANIMPARSER_HPP
+#ifndef NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP
+#define NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Config.hpp>
@@ -78,4 +78,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_FORMATS_MD5ANIMPARSER_HPP
+#endif // NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP
--- a/include/Nazara/Utility/Formats/MD5MeshParser.hpp
+++ b/include/Nazara/Utility/Formats/MD5MeshParser.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FORMATS_MD5MESHPARSER_HPP
-#define NAZARA_FORMATS_MD5MESHPARSER_HPP
+#ifndef NAZARA_UTILITY_FORMATS_MD5MESHPARSER_HPP
+#define NAZARA_UTILITY_FORMATS_MD5MESHPARSER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Math/Quaternion.hpp>
@@ -83,4 +83,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_FORMATS_MD5MESHPARSER_HPP
+#endif // NAZARA_UTILITY_FORMATS_MD5MESHPARSER_HPP
--- a/include/Nazara/Utility/Formats/MTLParser.hpp
+++ b/include/Nazara/Utility/Formats/MTLParser.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FORMATS_MTLPARSER_HPP
-#define NAZARA_FORMATS_MTLPARSER_HPP
+#ifndef NAZARA_UTILITY_FORMATS_MTLPARSER_HPP
+#define NAZARA_UTILITY_FORMATS_MTLPARSER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
@@ -76,4 +76,4 @@ namespace Nz

 #include <Nazara/Utility/Formats/MTLParser.inl>

-#endif // NAZARA_FORMATS_MTLPARSER_HPP
+#endif // NAZARA_UTILITY_FORMATS_MTLPARSER_HPP
--- a/include/Nazara/Utility/Formats/OBJParser.hpp
+++ b/include/Nazara/Utility/Formats/OBJParser.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_FORMATS_OBJPARSER_HPP
-#define NAZARA_FORMATS_OBJPARSER_HPP
+#ifndef NAZARA_UTILITY_FORMATS_OBJPARSER_HPP
+#define NAZARA_UTILITY_FORMATS_OBJPARSER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Math/Vector3.hpp>
@@ -103,4 +103,4 @@ namespace Nz

 #include <Nazara/Utility/Formats/OBJParser.inl>

-#endif // NAZARA_FORMATS_OBJPARSER_HPP
+#endif // NAZARA_UTILITY_FORMATS_OBJPARSER_HPP
--- a/include/Nazara/Utility/GuillotineImageAtlas.hpp
+++ b/include/Nazara/Utility/GuillotineImageAtlas.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_GUILLOTINEIMAGEATLAS_HPP
-#define NAZARA_GUILLOTINEIMAGEATLAS_HPP
+#ifndef NAZARA_UTILITY_GUILLOTINEIMAGEATLAS_HPP
+#define NAZARA_UTILITY_GUILLOTINEIMAGEATLAS_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/GuillotineBinPack.hpp>
@@ -73,4 +73,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_GUILLOTINEIMAGEATLAS_HPP
+#endif // NAZARA_UTILITY_GUILLOTINEIMAGEATLAS_HPP
--- a/include/Nazara/Utility/Image.hpp
+++ b/include/Nazara/Utility/Image.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_IMAGE_HPP
-#define NAZARA_IMAGE_HPP
+#ifndef NAZARA_UTILITY_IMAGE_HPP
+#define NAZARA_UTILITY_IMAGE_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
@@ -165,4 +165,4 @@ namespace Nz

 #include <Nazara/Utility/Image.inl>

-#endif // NAZARA_IMAGE_HPP
+#endif // NAZARA_UTILITY_IMAGE_HPP
--- a/include/Nazara/Utility/IndexBuffer.hpp
+++ b/include/Nazara/Utility/IndexBuffer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_INDEXBUFFER_HPP
-#define NAZARA_INDEXBUFFER_HPP
+#ifndef NAZARA_UTILITY_INDEXBUFFER_HPP
+#define NAZARA_UTILITY_INDEXBUFFER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Buffer.hpp>
@@ -67,4 +67,4 @@ namespace Nz

 #include <Nazara/Utility/IndexBuffer.inl>

-#endif // NAZARA_INDEXBUFFER_HPP
+#endif // NAZARA_UTILITY_INDEXBUFFER_HPP
--- a/include/Nazara/Utility/IndexIterator.hpp
+++ b/include/Nazara/Utility/IndexIterator.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_INDEXITERATOR_HPP
-#define NAZARA_INDEXITERATOR_HPP
+#ifndef NAZARA_UTILITY_INDEXITERATOR_HPP
+#define NAZARA_UTILITY_INDEXITERATOR_HPP

 #include <Nazara/Prerequisites.hpp>

@@ -79,4 +79,4 @@ namespace Nz

 #include <Nazara/Utility/IndexIterator.inl>

-#endif // NAZARA_INDEXITERATOR_HPP
+#endif // NAZARA_UTILITY_INDEXITERATOR_HPP
--- a/include/Nazara/Utility/IndexMapper.hpp
+++ b/include/Nazara/Utility/IndexMapper.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_INDEXMAPPER_HPP
-#define NAZARA_INDEXMAPPER_HPP
+#ifndef NAZARA_UTILITY_INDEXMAPPER_HPP
+#define NAZARA_UTILITY_INDEXMAPPER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
@@ -51,4 +51,4 @@ namespace Nz
 };
 }

-#endif // NAZARA_INDEXMAPPER_HPP
+#endif // NAZARA_UTILITY_INDEXMAPPER_HPP
--- a/include/Nazara/Utility/Joint.hpp
+++ b/include/Nazara/Utility/Joint.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_JOINT_HPP
-#define NAZARA_JOINT_HPP
+#ifndef NAZARA_UTILITY_JOINT_HPP
+#define NAZARA_UTILITY_JOINT_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Math/Matrix4.hpp>
@@ -46,4 +46,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_JOINT_HPP
+#endif // NAZARA_UTILITY_JOINT_HPP
--- a/include/Nazara/Utility/MaterialData.hpp
+++ b/include/Nazara/Utility/MaterialData.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_MATERIALDATA_HPP
-#define NAZARA_MATERIALDATA_HPP
+#ifndef NAZARA_UTILITY_MATERIALDATA_HPP
+#define NAZARA_UTILITY_MATERIALDATA_HPP

 namespace Nz
 {
@@ -68,4 +68,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_MATERIALDATA_HPP
+#endif // NAZARA_UTILITY_MATERIALDATA_HPP
--- a/include/Nazara/Utility/Mesh.hpp
+++ b/include/Nazara/Utility/Mesh.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_MESH_HPP
-#define NAZARA_MESH_HPP
+#ifndef NAZARA_UTILITY_MESH_HPP
+#define NAZARA_UTILITY_MESH_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
@@ -165,4 +165,4 @@ namespace Nz

 #include <Nazara/Utility/Mesh.inl>

-#endif // NAZARA_MESH_HPP
+#endif // NAZARA_UTILITY_MESH_HPP
--- a/include/Nazara/Utility/MeshData.hpp
+++ b/include/Nazara/Utility/MeshData.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_MESHDATA_HPP
-#define NAZARA_MESHDATA_HPP
+#ifndef NAZARA_UTILITY_MESHDATA_HPP
+#define NAZARA_UTILITY_MESHDATA_HPP

 #include <Nazara/Utility/Enums.hpp>

@@ -22,4 +22,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_MESHDATA_HPP
+#endif // NAZARA_UTILITY_MESHDATA_HPP
--- a/include/Nazara/Utility/Node.hpp
+++ b/include/Nazara/Utility/Node.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_NODE_HPP
-#define NAZARA_NODE_HPP
+#ifndef NAZARA_UTILITY_NODE_HPP
+#define NAZARA_UTILITY_NODE_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Signal.hpp>
@@ -130,4 +130,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_NODE_HPP
+#endif // NAZARA_UTILITY_NODE_HPP
--- a/include/Nazara/Utility/PixelFormat.hpp
+++ b/include/Nazara/Utility/PixelFormat.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_PIXELFORMAT_HPP
-#define NAZARA_PIXELFORMAT_HPP
+#ifndef NAZARA_UTILITY_PIXELFORMAT_HPP
+#define NAZARA_UTILITY_PIXELFORMAT_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Bitset.hpp>
@@ -95,4 +95,4 @@ namespace Nz

 #include <Nazara/Utility/PixelFormat.inl>

-#endif // NAZARA_PIXELFORMAT_HPP
+#endif // NAZARA_UTILITY_PIXELFORMAT_HPP
--- a/include/Nazara/Utility/RichTextDrawer.hpp
+++ b/include/Nazara/Utility/RichTextDrawer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_RICHTEXTDRAWER_HPP
-#define NAZARA_RICHTEXTDRAWER_HPP
+#ifndef NAZARA_UTILITY_RICHTEXTDRAWER_HPP
+#define NAZARA_UTILITY_RICHTEXTDRAWER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/AbstractTextDrawer.hpp>
@@ -209,4 +209,4 @@ namespace Nz

 #include <Nazara/Utility/RichTextDrawer.inl>

-#endif // NAZARA_RICHTEXTDRAWER_HPP
+#endif // NAZARA_UTILITY_RICHTEXTDRAWER_HPP
--- a/include/Nazara/Utility/Sequence.hpp
+++ b/include/Nazara/Utility/Sequence.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_SEQUENCE_HPP
-#define NAZARA_SEQUENCE_HPP
+#ifndef NAZARA_UTILITY_SEQUENCE_HPP
+#define NAZARA_UTILITY_SEQUENCE_HPP

 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
@@ -29,4 +29,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_SEQUENCE_HPP
+#endif // NAZARA_UTILITY_SEQUENCE_HPP
--- a/include/Nazara/Utility/SimpleTextDrawer.hpp
+++ b/include/Nazara/Utility/SimpleTextDrawer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_SIMPLETEXTDRAWER_HPP
-#define NAZARA_SIMPLETEXTDRAWER_HPP
+#ifndef NAZARA_UTILITY_SIMPLETEXTDRAWER_HPP
+#define NAZARA_UTILITY_SIMPLETEXTDRAWER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/AbstractTextDrawer.hpp>
@@ -122,4 +122,4 @@ namespace Nz

 #include <Nazara/Utility/SimpleTextDrawer.inl>

-#endif // NAZARA_SIMPLETEXTDRAWER_HPP
+#endif // NAZARA_UTILITY_SIMPLETEXTDRAWER_HPP
--- a/include/Nazara/Utility/SkeletalMesh.hpp
+++ b/include/Nazara/Utility/SkeletalMesh.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_SKELETALMESH_HPP
-#define NAZARA_SKELETALMESH_HPP
+#ifndef NAZARA_UTILITY_SKELETALMESH_HPP
+#define NAZARA_UTILITY_SKELETALMESH_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
@@ -41,4 +41,4 @@ namespace Nz

 #include <Nazara/Utility/SkeletalMesh.inl>

-#endif // NAZARA_SKELETALMESH_HPP
+#endif // NAZARA_UTILITY_SKELETALMESH_HPP
--- a/include/Nazara/Utility/Skeleton.hpp
+++ b/include/Nazara/Utility/Skeleton.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_SKELETON_HPP
-#define NAZARA_SKELETON_HPP
+#ifndef NAZARA_UTILITY_SKELETON_HPP
+#define NAZARA_UTILITY_SKELETON_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
@@ -68,4 +68,4 @@ namespace Nz

 #include <Nazara/Utility/Skeleton.inl>

-#endif // NAZARA_SKELETON_HPP
+#endif // NAZARA_UTILITY_SKELETON_HPP
--- a/include/Nazara/Utility/SoftwareBuffer.hpp
+++ b/include/Nazara/Utility/SoftwareBuffer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_SOFTWAREBUFFER_HPP
-#define NAZARA_SOFTWAREBUFFER_HPP
+#ifndef NAZARA_UTILITY_SOFTWAREBUFFER_HPP
+#define NAZARA_UTILITY_SOFTWAREBUFFER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/AbstractBuffer.hpp>
@@ -38,4 +38,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_SOFTWAREBUFFER_HPP
+#endif // NAZARA_UTILITY_SOFTWAREBUFFER_HPP
--- a/include/Nazara/Utility/StaticMesh.hpp
+++ b/include/Nazara/Utility/StaticMesh.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_STATICMESH_HPP
-#define NAZARA_STATICMESH_HPP
+#ifndef NAZARA_UTILITY_STATICMESH_HPP
+#define NAZARA_UTILITY_STATICMESH_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/SubMesh.hpp>
@@ -43,4 +43,4 @@ namespace Nz

 #include <Nazara/Utility/StaticMesh.inl>

-#endif // NAZARA_STATICMESH_HPP
+#endif // NAZARA_UTILITY_STATICMESH_HPP
--- a/include/Nazara/Utility/SubMesh.hpp
+++ b/include/Nazara/Utility/SubMesh.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_SUBMESH_HPP
-#define NAZARA_SUBMESH_HPP
+#ifndef NAZARA_UTILITY_SUBMESH_HPP
+#define NAZARA_UTILITY_SUBMESH_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Signal.hpp>
@@ -57,4 +57,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_SUBMESH_HPP
+#endif // NAZARA_UTILITY_SUBMESH_HPP
--- a/include/Nazara/Utility/TriangleIterator.hpp
+++ b/include/Nazara/Utility/TriangleIterator.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_TRIANGLEITERATOR_HPP
-#define NAZARA_TRIANGLEITERATOR_HPP
+#ifndef NAZARA_UTILITY_TRIANGLEITERATOR_HPP
+#define NAZARA_UTILITY_TRIANGLEITERATOR_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Enums.hpp>
@@ -37,4 +37,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_TRIANGLEITERATOR_HPP
+#endif // NAZARA_UTILITY_TRIANGLEITERATOR_HPP
--- a/include/Nazara/Utility/UniformBuffer.hpp
+++ b/include/Nazara/Utility/UniformBuffer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_UNIFORMBUFFER_HPP
-#define NAZARA_UNIFORMBUFFER_HPP
+#ifndef NAZARA_UTILITY_UNIFORMBUFFER_HPP
+#define NAZARA_UTILITY_UNIFORMBUFFER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Buffer.hpp>
@@ -54,4 +54,4 @@ namespace Nz

 #include <Nazara/Utility/UniformBuffer.inl>

-#endif // NAZARA_UNIFORMBUFFER_HPP
+#endif // NAZARA_UTILITY_UNIFORMBUFFER_HPP
--- a/include/Nazara/Utility/VertexBuffer.hpp
+++ b/include/Nazara/Utility/VertexBuffer.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_VERTEXBUFFER_HPP
-#define NAZARA_VERTEXBUFFER_HPP
+#ifndef NAZARA_UTILITY_VERTEXBUFFER_HPP
+#define NAZARA_UTILITY_VERTEXBUFFER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Buffer.hpp>
@@ -65,4 +65,4 @@ namespace Nz

 #include <Nazara/Utility/VertexBuffer.inl>

-#endif // NAZARA_VERTEXBUFFER_HPP
+#endif // NAZARA_UTILITY_VERTEXBUFFER_HPP
--- a/include/Nazara/Utility/VertexDeclaration.hpp
+++ b/include/Nazara/Utility/VertexDeclaration.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_VERTEXDECLARATION_HPP
-#define NAZARA_VERTEXDECLARATION_HPP
+#ifndef NAZARA_UTILITY_VERTEXDECLARATION_HPP
+#define NAZARA_UTILITY_VERTEXDECLARATION_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
@@ -83,4 +83,4 @@ namespace Nz

 #include <Nazara/Utility/VertexDeclaration.inl>

-#endif // NAZARA_VERTEXDECLARATION_HPP
+#endif // NAZARA_UTILITY_VERTEXDECLARATION_HPP
--- a/include/Nazara/Utility/VertexMapper.hpp
+++ b/include/Nazara/Utility/VertexMapper.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_VERTEXMAPPER_HPP
-#define NAZARA_VERTEXMAPPER_HPP
+#ifndef NAZARA_UTILITY_VERTEXMAPPER_HPP
+#define NAZARA_UTILITY_VERTEXMAPPER_HPP

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/SparsePtr.hpp>
@@ -41,4 +41,4 @@ namespace Nz

 #include <Nazara/Utility/VertexMapper.inl>

-#endif // NAZARA_VERTEXMAPPER_HPP
+#endif // NAZARA_UTILITY_VERTEXMAPPER_HPP
--- a/include/Nazara/Utility/VertexStruct.hpp
+++ b/include/Nazara/Utility/VertexStruct.hpp
@@ -4,8 +4,8 @@

 #pragma once

-#ifndef NAZARA_VERTEXSTRUCT_HPP
-#define NAZARA_VERTEXSTRUCT_HPP
+#ifndef NAZARA_UTILITY_VERTEXSTRUCT_HPP
+#define NAZARA_UTILITY_VERTEXSTRUCT_HPP

 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Math/Vector2.hpp>
@@ -83,4 +83,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_VERTEXSTRUCT_HPP
+#endif // NAZARA_UTILITY_VERTEXSTRUCT_HPP