diff --git a/src/Nazara/Renderer/GLSLShader.cpp b/src/Nazara/Renderer/GLSLShader.cpp
index f56cbada5..e7431722e 100644
--- a/src/Nazara/Renderer/GLSLShader.cpp
+++ b/src/Nazara/Renderer/GLSLShader.cpp
@@ -192,7 +192,7 @@ NzString NzGLSLShader::GetSourceCode(nzShaderType type) const
 
 int NzGLSLShader::GetUniformLocation(const NzString& name) const
 {
-	std::map<NzString, GLint>::const_iterator it = m_idCache.find(name);
+	auto it = m_idCache.find(name);
 	GLint id;
 	if (it == m_idCache.end())
 	{
diff --git a/src/Nazara/Renderer/GLSLShader.hpp b/src/Nazara/Renderer/GLSLShader.hpp
index 6e15d701d..b3f6ec6ce 100644
--- a/src/Nazara/Renderer/GLSLShader.hpp
+++ b/src/Nazara/Renderer/GLSLShader.hpp
@@ -71,8 +71,8 @@ class NzGLSLShader : public NzShaderImpl, NzResourceListener
 			const NzTexture* texture;
 		};
 
-		mutable std::map<NzString, GLint> m_idCache;
-		std::map<GLint, TextureSlot> m_textures;
+		mutable std::map<NzString, GLint> m_idCache; ///FIXME: unordered_map
+		std::map<GLint, TextureSlot> m_textures; ///FIXME: unordered_map
 		GLuint m_program;
 		GLuint m_shaders[nzShaderType_Max+1];
 		NzShader* m_parent;
diff --git a/src/Nazara/Renderer/ShaderBuilder.cpp b/src/Nazara/Renderer/ShaderBuilder.cpp
index 5a8c42644..28910c3ba 100644
--- a/src/Nazara/Renderer/ShaderBuilder.cpp
+++ b/src/Nazara/Renderer/ShaderBuilder.cpp
@@ -7,13 +7,13 @@
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Shader.hpp>
-#include <map>
 #include <memory>
+#include <unordered_map>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace
 {
-	std::map<nzUInt32, NzShader*> s_shaders;
+	std::unordered_map<nzUInt32, NzShader*> s_shaders;
 
 	NzString BuildFragmentShaderSource(nzUInt32 flags)
 	{
diff --git a/src/Nazara/Renderer/TextureSampler.cpp b/src/Nazara/Renderer/TextureSampler.cpp
index 99e0f6388..1fca2db30 100644
--- a/src/Nazara/Renderer/TextureSampler.cpp
+++ b/src/Nazara/Renderer/TextureSampler.cpp
@@ -8,11 +8,12 @@
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Texture.hpp>
+#include <unordered_map>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace
 {
-	std::map<nzUInt32, GLuint> s_samplers;
+	std::unordered_map<nzUInt32, GLuint> s_samplers;
 	nzUInt8 s_maxAnisotropyLevel;
 	bool s_useAnisotropicFilter;
 }
diff --git a/src/Nazara/Utility/PixelFormat.cpp b/src/Nazara/Utility/PixelFormat.cpp
index f3ba68909..840b2de17 100644
--- a/src/Nazara/Utility/PixelFormat.cpp
+++ b/src/Nazara/Utility/PixelFormat.cpp
@@ -5,7 +5,6 @@
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Core/Endianness.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Utility/Debug.hpp>
 
 namespace
diff --git a/src/Nazara/Utility/Skeleton.cpp b/src/Nazara/Utility/Skeleton.cpp
index 92c303a92..541f52120 100644
--- a/src/Nazara/Utility/Skeleton.cpp
+++ b/src/Nazara/Utility/Skeleton.cpp
@@ -9,7 +9,7 @@
 
 struct NzSkeletonImpl
 {
-	std::map<NzString, unsigned int> jointMap;
+	std::map<NzString, unsigned int> jointMap; ///FIXME: unordered_map
 	std::vector<NzJoint> joints;
 	NzAxisAlignedBox aabb;
 	bool jointMapUpdated = false;