diff --git a/include/Nazara/Core/HashDigest.hpp b/include/Nazara/Core/HashDigest.hpp
index da4afb227..8f61dd2f4 100644
--- a/include/Nazara/Core/HashDigest.hpp
+++ b/include/Nazara/Core/HashDigest.hpp
@@ -11,7 +11,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/String.hpp>
-#include <ostream>
+#include <iosfwd>
 
 class NAZARA_API NzHashDigest
 {
diff --git a/src/Nazara/Audio/Loaders/sndfile/Loader.cpp b/src/Nazara/Audio/Loaders/sndfile/Loader.cpp
index 62a1268ab..d60d4e2de 100644
--- a/src/Nazara/Audio/Loaders/sndfile/Loader.cpp
+++ b/src/Nazara/Audio/Loaders/sndfile/Loader.cpp
@@ -61,7 +61,7 @@ namespace
 
     sf_count_t Tell(void* user_data)
     {
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
+        NzInputStream* stream = static_cast<NzInputStream*>(user_data);
         return stream->GetCursorPos();
     }
 
diff --git a/src/Nazara/Core/Hash/SHA/Internal.cpp b/src/Nazara/Core/Hash/SHA/Internal.cpp
index 9ea5069cb..d011ddbe3 100644
--- a/src/Nazara/Core/Hash/SHA/Internal.cpp
+++ b/src/Nazara/Core/Hash/SHA/Internal.cpp
@@ -770,14 +770,6 @@ void SHA224_Init(SHA_CTX* context)
 	SHA256_Internal_Init(context, sha224_initial_hash_value);
 }
 
-namespace
-{
-	void SHA224_Internal_Transform(SHA_CTX* context, const nzUInt32* data)
-	{
-		SHA256_Internal_Transform(context, data);
-	}
-}
-
 void SHA224_Update(SHA_CTX* context, const nzUInt8 *data, std::size_t len)
 {
 	SHA256_Update(context, data, len);
diff --git a/src/Nazara/Renderer/UberShaderPreprocessor.cpp b/src/Nazara/Renderer/UberShaderPreprocessor.cpp
index 5dd74bc32..22790bbc4 100644
--- a/src/Nazara/Renderer/UberShaderPreprocessor.cpp
+++ b/src/Nazara/Renderer/UberShaderPreprocessor.cpp
@@ -81,22 +81,18 @@ NzUberShaderInstance* NzUberShaderPreprocessor::Get(const NzParameterList& param
 						stage.SetSource(code);
 						stage.Compile();
 
-						shader->AttachStage(static_cast<nzShaderStage>(i), stage);
-
-						shaderStage.cache.emplace(flags, std::move(stage));
+						stageIt = shaderStage.cache.emplace(flags, std::move(stage)).first;
 					}
-					else
-						shader->AttachStage(static_cast<nzShaderStage>(i), stageIt->second);
+
+					shader->AttachStage(static_cast<nzShaderStage>(i), stageIt->second);
 				}
 			}
 
 			shader->Link();
 
 			// On construit l'instant
-			auto pair = m_cache.emplace(flags, shader.get());
+			shaderIt = m_cache.emplace(flags, shader.get()).first;
 			shader.release();
-
-			return &(pair.first)->second; // On retourne l'objet construit
 		}
 		catch (const std::exception& e)
 		{
@@ -106,8 +102,8 @@ NzUberShaderInstance* NzUberShaderPreprocessor::Get(const NzParameterList& param
 			throw;
 		}
 	}
-	else
-		return &shaderIt->second;
+
+	return &shaderIt->second;
 }
 
 void NzUberShaderPreprocessor::SetShader(nzShaderStage stage, const NzString& source, const NzString& shaderFlags, const NzString& requiredFlags)